more cleanup

git-svn-id: svn://10.0.0.236/branches/alecf_urlbarcleanup@89710 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/tools/tinderbox-configs/firefox/linux/tinder-config.pl

@@ -1,248 +0,0 @@
-#
-### hostname: bl-bldlnx03.office.mozilla.org
-### uname: Linux bl-bldlnx03.office.mozilla.org 2.6.18-1.2798.fc6 #1 SMP Mon Oct 16 14:54:20 EDT 2006 i686 i686 i386 GNU/Linux
-##
-#
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
-
-# $ENV{MOZ_PACKAGE_MSI}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Controls whether a MSI package is made.
-# Requires: Windows and a local MakeMSI installation.
-#$ENV{MOZ_PACKAGE_MSI} = 0;
-
-# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
-#-----------------------------------------------------------------------------
-#  Default: scp
-#   Values: scp | rsync
-#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
-# Requires: The selected type requires the command be available both locally
-#           and on the Talkback server.
-#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-#- You'll need to change these to suit your machine's needs
-#$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-#$BuildDepend       = 1;      # Depend or Clobber
-#$BuildDebug        = 0;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-$TestOnly          = 1;      # Only run tests, don't pull/build
-#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# Tests
-$CleanProfile             = 1;
-#$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 1;
-$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-#$BloatTest                = 0;  # warren memory bloat test
-#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-#$DomToTextConversionTest  = 0;  
-#$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-#$MailBloatTest            = 0;
-#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest   = 1;  # Tp
-$DHTMLPerformanceTest     = 1;  # Tdhtml
-#$QATest                   = 0;  
-$XULWindowOpenTest        = 1;  # Txul
-$StartupPerformanceTest   = 1;  # Ts
-
-$TestsPhoneHome           = 1;  # Should test report back to server?
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a7pre.en-US.linux-i686.tar.bz2';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/fx-linux-tbox-trunk';
-$DownloadBuildDir = 'firefox';
-
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=Firefox&quickparse=1';
-$MatchBuildname = 'Linux fx-linux-tbox Depend Nightly';
-$GraphNameOverride        = "bl-bldlnx03_fx-linux-tbox-HEAD"; # Override name built from ::hostname() and $BuildTag
-
-# $results_server
-#----------------------------------------------------------------------------
-# Server on which test results will be accessible.  This was originally tegu,
-# then became axolotl.  Once we moved services from axolotl, it was time
-# to give this service its own hostname to make future transitions easier.
-# - cmp@mozilla.org
-#$results_server           = "build-graphs.mozilla.org";
-
-$pageload_server          = "spider.office.mozilla.org";
-
-#
-# Timeouts, values are in seconds.
-#
-#$CVSCheckoutTimeout               = 3600;
-#$CreateProfileTimeout             = 45;
-#$RegxpcomTestTimeout              = 120;
-
-$AliveTestTimeout                 = 5;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-#$BloatTestTimeout                 = 120;   # seconds
-#$MailBloatTestTimeout             = 120;   # seconds
-#$JavaTestTimeout                  = 45;
-#$DomTestTimeout	                  = 45;    # seconds
-#$XpcomGlueTestTimeout             = 15;
-#$CodesizeTestTimeout              = 900;     # seconds
-#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
-#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
-#$QATestTimeout                    = 1200;   # entire test, seconds
-#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-#$StartupPerformanceTestTimeout    = 15;    # seconds
-#$XULWindowOpenTestTimeout	      = 150;   # seconds
-
-
-#$MozConfigFileName = 'mozconfig';
-
-#$UseMozillaProfile = 1;
-#$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-#$Make          = 'gmake';       # Must be GNU make
-#$MakeOverrides = '';
-#$mail          = '/bin/mail';
-#$CVS           = 'cvs -q';
-#$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-#$blat           = 'c:/nstools/bin/blat';
-#$use_blat       = 0;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-#$moz_cvsroot   = $ENV{CVSROOT};
-
-#- Set these proper values for your tinderbox server
-#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-#$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-#$ObjDir = '';
-
-# Extra build name, if needed.
-$BuildNameExtra = "fx-linux-tbox perf test";
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-#$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-$BuildSleep = 1;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'MozillaExperimental';
-
-$BuildTag = 'HEAD';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-
-$BinaryName = 'firefox-bin';
-
-#
-# For embedding app, use:
-#$EmbedBinaryName = 'TestGtkEmbed';
-#$EmbedDistDir    = 'dist/bin'
-
-
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';
-
-# Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
-#$ssh_user      = "cltbld";
-#$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-#$RebootSystem = 0;
-
-# LogCompression specifies the type of compression used on the log file.
-# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
-# for 'gzip' or 'bzip2' are in the user's path before setting this
-# option.
-#$LogCompression = '';
-
-# LogEncoding specifies the encoding format used for the logs. Valid
-# options are 'base64', and 'uuencode'. If $LogCompression is set above,
-# this needs to be set to 'base64' or 'uuencode' to ensure that the
-# binary data is transferred properly.
-#$LogEncoding = '';
-
-# Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill. 
-#$ENV{NO_EM_RESTART} = '1';

mozilla/tools/tinderbox-configs/firefox/win32/tinder-config.pl

@@ -1,250 +0,0 @@
-#
-#### hostname: bl-bldxp01.office.mozilla.org
-#### uname: CYGWIN_NT-5.1 bl-bldxp01 1.5.19(0.150/4/2) 2006-01-20 13:28 i686 Cygwin
-###
-#
-#- tinder-config.pl - Tinderbox configuration file.
-#-    Uncomment the variables you need to set.
-#-    The default values are the same as the commented variables.
-
-# $ENV{XPCOM_CC_DO_NOTHING}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Turn graydon's cycle collector on/off
-#$ENV{XPCOM_CC_DO_NOTHING} = 0;
-
-# $ENV{MOZ_PACKAGE_MSI}
-#-----------------------------------------------------------------------------
-#  Default: 0
-#   Values: 0 | 1
-#  Purpose: Controls whether a MSI package is made.
-# Requires: Windows and a local MakeMSI installation.
-#$ENV{MOZ_PACKAGE_MSI} = 0;
-
-# $ENV{MOZ_SYMBOLS_TRANSFER_TYPE}
-#-----------------------------------------------------------------------------
-#  Default: scp
-#   Values: scp | rsync
-#  Purpose: Use scp or rsync to transfer symbols to the Talkback server.
-# Requires: The selected type requires the command be available both locally
-#           and on the Talkback server.
-#$ENV{MOZ_SYMBOLS_TRANSFER_TYPE} = "scp";
-
-#- PLEASE FILL THIS IN WITH YOUR PROPER EMAIL ADDRESS
-#$BuildAdministrator = "$ENV{USER}\@$ENV{HOST}";
-#$BuildAdministrator = ($ENV{USER} || "cltbld") . "\@" . ($ENV{HOST} || "dhcp");
-
-#- You'll need to change these to suit your machine's needs
-#$DisplayServer = ':0.0';
-
-#- Default values of command-line opts
-#-
-#$BuildDepend       = 1;      # Depend or Clobber
-#$BuildDebug        = 0;      # Debug or Opt (Darwin)
-#$ReportStatus      = 1;      # Send results to server, or not
-#$ReportFinalStatus = 1;      # Finer control over $ReportStatus.
-#$UseTimeStamp      = 1;      # Use the CVS 'pull-by-timestamp' option, or not
-#$BuildOnce         = 0;      # Build once, don't send results to server
-$TestOnly          = 1;      # Only run tests, don't pull/build
-#$BuildEmbed        = 0;      # After building seamonkey, go build embed app.
-#$SkipMozilla       = 0;      # Use to debug post-mozilla.pl scripts.
-#$SkipCheckout      = 0;      # Use to debug build process without checking out new source.
-#$BuildLocales      = 0;      # Do l10n packaging?
-
-# Tests
-$CleanProfile             = 1;
-#$ResetHomeDirForTests     = 1;
-#$ProductName              = "Mozilla";
-$VendorName               = 'mozilla';
-
-#$RunMozillaTests          = 1;  # Allow turning off of all tests if needed.
-$RegxpcomTest             = 0;
-$AliveTest                = 1;
-#$JavaTest                 = 0;
-#$ViewerTest               = 0;
-#$BloatTest                = 0;  # warren memory bloat test
-#$BloatTest2               = 0;  # dbaron memory bloat test, require tracemalloc
-#$DomToTextConversionTest  = 0;  
-#$XpcomGlueTest            = 0;
-$CodesizeTest             = 0;  # Z,  require mozilla/tools/codesighs
-$EmbedCodesizeTest        = 0;  # mZ, require mozilla/tools/codesigns
-#$MailBloatTest            = 0;
-#$EmbedTest                = 0;  # Assumes you wanted $BuildEmbed=1
-$LayoutPerformanceTest    = 1;  # Tp
-$LayoutPerformanceLocalTest = 1;  # Tp2
-$DHTMLPerformanceTest     = 1;  # Tdhtml
-#$QATest                   = 0;  
-$XULWindowOpenTest        = 1;  # Txul
-$StartupPerformanceTest   = 1;  # Ts
-
-$TestsPhoneHome           = 1;  # Should test report back to server?
-# If TestOnlyTinderbox is enabled, fetch the latest build info from tinderbox in a 
-# parseable format
-$TinderboxServerURL = 'http://tinderbox.mozilla.org/showbuilds.cgi?tree=MozillaExperimental&quickparse=1';
-$MatchBuildname = 'WINNT 5.2 fxnewref-win32- Depend Fx-Newref';
-#$GraphNameOverride        = 'Fx-Trunk-win32-test1'; # Override name built from ::hostname() and $BuildTag
-
-# $results_server
-#----------------------------------------------------------------------------
-# Server on which test results will be accessible.  This was originally tegu,
-# then became axolotl.  Once we moved services from axolotl, it was time
-# to give this service its own hostname to make future transitions easier.
-# - cmp@mozilla.org
-#$results_server           = "build-graphs.mozilla.org";
-
-$pageload_server          = "spider.office.mozilla.org";
-
-#
-# Timeouts, values are in seconds.
-#
-#$CVSCheckoutTimeout               = 3600;
-#$CreateProfileTimeout             = 45;
-#$RegxpcomTestTimeout              = 120;
-
-$AliveTestTimeout                 = 45;
-#$ViewerTestTimeout                = 45;
-#$EmbedTestTimeout                 = 45;
-#$BloatTestTimeout                 = 120;   # seconds
-#$MailBloatTestTimeout             = 120;   # seconds
-#$JavaTestTimeout                  = 45;
-#$DomTestTimeout	                  = 45;    # seconds
-#$XpcomGlueTestTimeout             = 15;
-#$CodesizeTestTimeout              = 900;     # seconds
-#$CodesizeTestType                 = "auto";  # {"auto"|"base"}
-#$LayoutPerformanceTestTimeout     = 1200;  # entire test, seconds
-#$LayoutPerformanceLocalTestTimeout     = 1200;  # entire test, seconds
-#$DHTMLPerformanceTestTimeout      = 1200;  # entire test, seconds
-#$QATestTimeout                    = 1200;   # entire test, seconds
-#$LayoutPerformanceTestPageTimeout = 30000; # each page, ms
-#$StartupPerformanceTestTimeout    = 15;    # seconds
-#$XULWindowOpenTestTimeout	      = 150;   # seconds
-
-
-#$MozConfigFileName = 'mozconfig';
-
-#$UseMozillaProfile = 1;
-#$MozProfileName = 'default';
-
-#- Set these to what makes sense for your system
-#$Make          = 'gmake';       # Must be GNU make
-#$MakeOverrides = '';
-#$mail          = '/bin/mail';
-#$CVS           = 'cvs -q';
-#$CVSCO         = 'checkout -P';
-
-# win32 usually doesn't have /bin/mail
-#$blat           = 'c:/nstools/bin/blat';
-#$use_blat       = 0;
-
-# Set moz_cvsroot to something like:
-# :pserver:$ENV{USER}%netscape.com\@cvs.mozilla.org:/cvsroot
-# :pserver:anonymous\@cvs-mirror.mozilla.org:/cvsroot
-#
-# Note that win32 may not need \@, depends on ' or ".
-# :pserver:$ENV{USER}%netscape.com@cvs.mozilla.org:/cvsroot
-
-#$moz_cvsroot   = $ENV{CVSROOT};
-
-#- Set these proper values for your tinderbox server
-#$Tinderbox_server = 'tinderbox-daemon@tinderbox.mozilla.org';
-
-# Allow for non-client builds, e.g. camino.
-#$moz_client_mk = 'client.mk';
-
-#- Set if you want to build in a separate object tree
-#$ObjDir = '';
-
-# Extra build name, if needed.
-$BuildNameExtra = 'fxnewref-win32-tbox perf test';
-
-# User comment, eg. ip address for dhcp builds.
-# ex: $UserComment = "ip = 208.12.36.108";
-#$UserComment = 0;
-
-#-
-#- The rest should not need to be changed
-#-
-
-#- Minimum wait period from start of build to start of next build in minutes.
-#$BuildSleep = 10;
-
-#- Until you get the script working. When it works,
-#- change to the tree you're actually building
-$BuildTree  = 'Firefox';
-
-$BuildTag = 'HEAD';
-#$BuildConfigDir = 'mozilla/config';
-#$Topsrcdir = 'mozilla';
-
-$BinaryName = 'firefox.exe';
-
-#
-# For embedding app, use:
-#$EmbedBinaryName = 'TestGtkEmbed';
-#$EmbedDistDir    = 'dist/bin'
-
-
-#$ShellOverride = ''; # Only used if the default shell is too stupid
-#$ConfigureArgs = '';
-#$ConfigureEnvArgs = '';
-#$Compiler = 'gcc';
-#$NSPRArgs = '';
-#$ShellOverride = '';
-
-# Release build options
-#$ReleaseBuild  = 1;
-#$clean_objdir = 1; # remove objdir when starting release cycle?
-#$clean_srcdir = 1; # remove srcdir when starting release cycle?
-#$shiptalkback  = 1;
-#$ReleaseToLatest = 1; # Push the release to latest-<milestone>?
-#$ReleaseToDated = 1; # Push the release to YYYY-MM-DD-HH-<milestone>?
-#$ReleaseGroup = ''; # group to set uploaded files to
-#$build_hour    = "8";
-#$package_creation_path = "/xpinstall/packager";
-# needs setting for mac + talkback: $mac_bundle_path = "/browser/app";
-#$ssh_version   = "2";
-#$ssh_user      = "cltbld";
-#$ssh_server    = "stage.mozilla.org";
-#$ftp_path      = "/home/ftp/pub/mozilla/nightly/experimental";
-#$url_path      = "http://ftp.mozilla.org/pub/mozilla.org/mozilla/nightly/experimental";
-#$tbox_ftp_path = $ftp_path;
-#$tbox_url_path = $url_path;
-#$milestone     = "trunk";
-#$notify_list   = "cmp\@mozilla.org";
-#$stub_installer = 1;
-#$sea_installer = 1;
-#$archive       = 0;
-#$push_raw_xpis = 1;
-
-# Reboot the OS at the end of build-and-test cycle. This is primarily
-# intended for Win9x, which can't last more than a few cycles before
-# locking up (and testing would be suspect even after a couple of cycles).
-# Right now, there is only code to force the reboot for Win9x, so even
-# setting this to 1, will not have an effect on other platforms. Setting
-# up win9x to automatically logon and begin running tinderbox is left 
-# as an exercise to the reader. 
-#$RebootSystem = 0;
-
-# LogCompression specifies the type of compression used on the log file.
-# Valid options are 'gzip', and 'bzip2'. Please make sure the binaries
-# for 'gzip' or 'bzip2' are in the user's path before setting this
-# option.
-#$LogCompression = '';
-
-# LogEncoding specifies the encoding format used for the logs. Valid
-# options are 'base64', and 'uuencode'. If $LogCompression is set above,
-# this needs to be set to 'base64' or 'uuencode' to ensure that the
-# binary data is transferred properly.
-#$LogEncoding = '';
-
-# Prevent Extension Manager from spawning child processes during tests
-# - processes that tbox scripts cannot kill. 
-#$ENV{NO_EM_RESTART} = '1';
-# If tinderbox is running in a test-only mode, it needs to be able to download
-# the latest build and unpack it rather than building it.
-$TestOnlyTinderbox = 1;
-$DownloadBuildFile = 'firefox-3.0a8pre.en-US.win32.zip';
-$DownloadBuildURL = 'http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/experimental/win32-newref/hourly-builds/latest-trunk';
-$DownloadBuildDir = 'firefox';
-

mozilla/xpfe/components/urlbarhistory/Makefile.in

@@ -0,0 +1,31 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s):  
+#
+
+DEPTH		= ../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+DIRS		= public src
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/makefile.win

@@ -0,0 +1,26 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..
+
+DIRS=public src
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/MANIFEST_IDL

@@ -0,0 +1 @@
+nsIUrlbarHistory.idl

mozilla/xpfe/components/urlbarhistory/public/Makefile.in

@@ -0,0 +1,35 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+XPIDL_MODULE	= urlbarhistory
+
+XPIDLSRCS	= nsIUrlbarHistory.idl        \
+                  $(NULL)
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/public/makefile.win

@@ -0,0 +1,30 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+
+MODULE=urlbarhistory
+
+XPIDLSRCS =                   \
+    .\nsIUrlbarHistory.idl          \
+    $(NULL)
+
+include <$(DEPTH)\config\rules.mak>

mozilla/xpfe/components/urlbarhistory/public/nsIUrlbarHistory.idl

@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is mozilla.org code.
+ *
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1999 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s): Radha Kulkarni (radha@netscape.com)
+ *                 Jason Eager    (jce2@po.cwru.edu)
+ */
+ 
+#include "nsISupports.idl"
+#include "nsIFactory.idl"
+
+
+%{C++
+#define NS_URLBARHISTORY_CID \
+{0x74254499, 0x171a, 0x11d4, {0x98, 0x70, 0x0, 0xc0, 0x4f, 0xa0, 0x2f, 0x40}}
+
+
+#define NS_URLBARHISTORY_CONTRACTID "@mozilla.org/browser/urlbarhistory;1"
+#define NS_URLBARAUTOCOMPLETE_CONTRACTID "@mozilla.org/autocompleteSession;1?type=urlbar"
+#define UBHISTORY_MAX_ENTRIES = 15;
+%}
+
+[scriptable, uuid(74254499-171a-11d4-9870-00c04fa02f40)]
+interface nsIUrlbarHistory: nsISupports
+{
+  /**
+   * Get the size of the History list
+   */
+   readonly attribute long count;
+
+  /**
+   * clear the History contents
+   */
+   void clearHistory();
+    
+
+};

mozilla/xpfe/components/urlbarhistory/src/Makefile.in

@@ -0,0 +1,40 @@
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+#
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+
+include $(DEPTH)/config/autoconf.mk
+
+MODULE		= appcomps
+LIBRARY_NAME	= urlbarhistory_s
+REQUIRES	= xpcom string rdf pref js necko
+
+CPPSRCS		= nsUrlbarHistory.cpp
+
+# we don't want the shared lib, but we want to force the creation of a
+# static lib.
+override NO_SHARED_LIB=1
+override NO_STATIC_LIB=
+
+include $(topsrcdir)/config/rules.mk

mozilla/xpfe/components/urlbarhistory/src/makefile.win

@@ -0,0 +1,40 @@
+#!nmake
+#
+# The contents of this file are subject to the Netscape Public
+# License Version 1.1 (the "License"); you may not use this file
+# except in compliance with the License. You may obtain a copy of
+# the License at http://www.mozilla.org/NPL/
+#
+# Software distributed under the License is distributed on an "AS
+# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+# implied. See the License for the specific language governing
+# rights and limitations under the License.
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is Netscape
+# Communications Corporation.  Portions created by Netscape are
+# Copyright (C) 1998 Netscape Communications Corporation. All
+# Rights Reserved.
+#
+# Contributor(s): 
+
+DEPTH=..\..\..\..
+MODULE=appcomps
+LIBRARY_NAME=urlbarhistory_s
+
+CPP_OBJS=                               \
+ .\$(OBJDIR)\nsUrlbarHistory.obj        \
+ $(NULL)
+
+LCFLAGS = \
+        $(LCFLAGS) \
+        $(DEFINES) \
+        $(NULL)
+
+include <$(DEPTH)\config\rules.mak>
+
+install:: $(LIBRARY)
+	$(MAKE_INSTALL) $(LIBRARY) $(DIST)\lib
+
+clobber::
+        rm -f $(DIST)\lib\$(LIBRARY_NAME).lib

mozilla/xpfe/components/urlbarhistory/src/nsUBHistoryModule.cpp

@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * The Original Code is Mozilla Communicator client code.
+ *
+ * The Initial Developer of the Original Code is Netscape Communications
+ * Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation. All
+ * Rights Reserved.
+ *
+ * Contributor(s):  Radha Kulkarni radha@netscape.com
+ */
+
+#include "nsIModule.h"
+#include "nsIGenericFactory.h"
+#include "nsIComponentManager.h"
+#include "nsIServiceManager.h"
+#include "nsIUrlbarHistory.h"
+
+#include "nsUrlbarHistory.h"
+
+// Factory Constructors
+
+NS_GENERIC_FACTORY_CONSTRUCTOR(nsUrlbarHistory)
+
+///////////////////////////////////////////////////////////////////////////////
+// Module implementation for the history library
+
+static nsModuleComponentInfo gUBHistoryModuleInfo[] = 
+{
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARHISTORY_CONTRACTID, nsUrlbarHistoryConstructor },
+   { "nsUrlbarHistory", NS_URLBARHISTORY_CID,
+      NS_URLBARAUTOCOMPLETE_CONTRACTID, nsUrlbarHistoryConstructor }
+};
+
+NS_IMPL_NSGETMODULE("Urlbar History Module", gUBHistoryModuleInfo)

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.cpp

@@ -0,0 +1,677 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ * 
+ */
+
+// Local Includes 
+#include "nsUrlbarHistory.h"
+
+// Helper Classes
+#include "nsXPIDLString.h"
+
+// Interfaces Needed
+#include "nsString.h"
+#include "nsIAutoCompleteResults.h"
+#include "nsISimpleEnumerator.h"
+#include "nsIPref.h"
+#include "nsIServiceManager.h"
+#include "nsIRDFService.h"
+#include "nsIRDFContainer.h"
+#include "nsIRDFContainerUtils.h"
+#include "nsIURL.h"
+
+
+static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID);
+static NS_DEFINE_CID(kPrefServiceCID, NS_PREF_CID);
+static NS_DEFINE_CID(kRDFCUtilsCID, NS_RDFCONTAINERUTILS_CID);
+static NS_DEFINE_CID(kStandardURLCID, NS_STANDARDURL_CID);
+
+static char * ignoreArray[] = {
+		"http://",
+	    "ftp://",
+		"www.",
+		"http://www.",
+		"https://",
+		"https://www.",
+		"keyword:",
+		"://",
+		"//",
+		"\\",
+		":\\",
+		"file:///",
+		".com",
+		".org",
+		".net",
+		".",
+		"?",
+		"&",
+		"="
+	};
+static nsIRDFResource * kNC_CHILD;
+static nsIRDFResource * kNC_URLBARHISTORY;
+static nsIRDFService * gRDFService;
+static nsIRDFContainerUtils * gRDFCUtils;
+
+#define PREF_AUTOCOMPLETE_ENABLED "browser.urlbar.autocomplete.enabled"
+
+
+
+//*****************************************************************************
+//***    nsUrlbarHistory: Object Management
+//*****************************************************************************
+
+nsUrlbarHistory::nsUrlbarHistory()
+{
+   NS_INIT_REFCNT();
+   PRInt32 cnt = sizeof(ignoreArray)/sizeof(char *);
+   for(PRInt32 i=0; i< cnt; i++) 
+     mIgnoreArray.AppendString(NS_ConvertASCIItoUCS2(ignoreArray[i]));
+   
+   nsresult res;
+
+   res = nsServiceManager::GetService(kRDFServiceCID, NS_GET_IID(nsIRDFService),
+                                      (nsISupports **)&gRDFService);
+   res = nsServiceManager::GetService(kRDFCUtilsCID, NS_GET_IID(nsIRDFContainerUtils),
+                                      (nsISupports **)&gRDFCUtils);
+   if (gRDFService) {
+	   //printf("$$$$ Got RDF SERVICE $$$$\n");
+     res = gRDFService->GetDataSource("rdf:localstore", getter_AddRefs(mDataSource));
+
+	 res = gRDFService->GetResource("http://home.netscape.com/NC-rdf#child", &kNC_CHILD);
+	 res = gRDFService->GetResource("nc:urlbar-history", &kNC_URLBARHISTORY);
+   }
+   
+   nsCOMPtr<nsIPref> prefs = do_GetService(kPrefServiceCID, &res);
+   if (NS_SUCCEEDED(res)) {
+       prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+       prefs->AddObserver(PREF_AUTOCOMPLETE_ENABLED, this);
+   }
+   
+}
+
+
+nsUrlbarHistory::~nsUrlbarHistory()
+{
+	//Entries are now in RDF
+    //ClearHistory();
+    
+	mDataSource = nsnull;
+    
+    NS_IF_RELEASE(gRDFService);
+    NS_IF_RELEASE(gRDFCUtils);
+	NS_IF_RELEASE(kNC_URLBARHISTORY);
+	NS_IF_RELEASE(kNC_CHILD);
+
+}
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISupports
+//*****************************************************************************
+
+NS_IMPL_ADDREF(nsUrlbarHistory)
+NS_IMPL_RELEASE(nsUrlbarHistory)
+
+NS_INTERFACE_MAP_BEGIN(nsUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIAutoCompleteSession)
+   NS_INTERFACE_MAP_ENTRY(nsIUrlbarHistory)
+   NS_INTERFACE_MAP_ENTRY(nsIObserver)
+   NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIUrlbarHistory)
+NS_INTERFACE_MAP_END
+
+//*****************************************************************************
+//    nsUrlbarHistory: nsISHistory
+//*****************************************************************************
+	NS_IMETHODIMP
+nsUrlbarHistory::ClearHistory()
+{
+  /* Get the elements in the data source through the container
+   */
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource,
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+ 
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+
+  /* Remove all the elements, back to front, to avoid O(n^2) updates
+   * from RDF.
+   */
+  PRInt32 count = 0;
+  container->GetCount(&count);
+  for (PRInt32 i = count; i >= 1; --i) {
+    nsCOMPtr<nsIRDFNode> dummy;
+    container->RemoveElementAt(i, PR_TRUE, getter_AddRefs(dummy));
+  }
+
+#ifdef DEBUG
+  container->GetCount(&count);
+  NS_ASSERTION(count == 0, "count != 0 after clearing history");
+#endif
+
+  return NS_OK;
+}
+
+
+/* Get size of the history list */
+NS_IMETHODIMP
+nsUrlbarHistory::GetCount(PRInt32 * aResult)
+{
+  NS_ENSURE_ARG_POINTER(aResult);
+
+  nsCOMPtr<nsIRDFContainer> container;
+  gRDFCUtils->MakeSeq(mDataSource, 
+                      kNC_URLBARHISTORY,
+                      getter_AddRefs(container));
+
+  NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+  return container->GetCount(aResult);
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStartLookup(const PRUnichar *uSearchString,
+                               nsIAutoCompleteResults *previousSearchResult,
+                               nsIAutoCompleteListener *listener)
+{
+    nsresult rv = NS_OK;
+ 
+    if (!listener)
+        return NS_ERROR_NULL_POINTER;
+      
+	if (!mEnabled) {// urlbar autocomplete is not enabled
+		listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		return NS_OK;
+	}
+ //   printf("Autocomplete is enabled\n");   
+
+    if (uSearchString[0] == 0)
+    {
+        listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+        return NS_OK;
+    }
+ 
+    // Check if it is one of the generic strings "http://, www., ftp:// etc..
+    PRInt32 cnt = mIgnoreArray.Count();
+	for(PRInt32 i=0; i<cnt; i++) {
+       nsString * match = mIgnoreArray.StringAt(i);
+	   
+	   if (match) {
+          PRInt32 index = match->Find(uSearchString, PR_TRUE);
+		  if (index == 0) {
+			  listener->OnAutoComplete(nsnull, nsIAutoCompleteStatus::ignored);
+		      return NS_OK;
+		  }
+	   }  // match
+	}  //for
+    
+    nsCOMPtr<nsIAutoCompleteResults> results;
+	/* Don't call SearchPreviousResults. It is buggy 
+    if (NS_FAILED(SearchPreviousResults(uSearchString, previousSearchResult)))
+    {
+        results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+		NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+        rv = SearchCache(uSearchString, results);       
+    }
+    else
+        results = previousSearchResult;
+      */
+	
+	results = do_CreateInstance(NS_AUTOCOMPLETERESULTS_CONTRACTID);
+	NS_ENSURE_TRUE(results, NS_ERROR_FAILURE);
+    rv = SearchCache(nsLiteralString(uSearchString), results);    
+
+    AutoCompleteStatus status = nsIAutoCompleteStatus::failed;
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRBool addedDefaultItem = PR_FALSE;
+
+    results->SetSearchString(uSearchString);
+    results->SetDefaultItemIndex(-1);
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = results->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return NS_OK;
+    
+    PRUint32 nbrOfItems;
+    rv = array->Count(&nbrOfItems);
+
+    if (NS_SUCCEEDED(rv)) {
+        if (nbrOfItems > 1) {
+            results->SetDefaultItemIndex(addedDefaultItem ? 1 : 0);
+            status = nsIAutoCompleteStatus::matchFound;
+        }
+        else {
+            if (nbrOfItems == 1) {
+                results->SetDefaultItemIndex(0);
+                status = nsIAutoCompleteStatus::matchFound;
+            }
+            else
+                status = nsIAutoCompleteStatus::noMatch;
+        }
+    }  // NS_SUCCEEDED(rv)
+
+    listener->OnAutoComplete(results, status);
+    
+    return NS_OK;
+}
+
+#if 0
+NS_IMETHODIMP
+nsUrlbarHistory::SearchPreviousResults(const PRUnichar *searchStr,
+                                       nsIAutoCompleteResults *previousSearchResult)
+{
+    if (!previousSearchResult)
+        return NS_ERROR_NULL_POINTER;
+        
+    nsXPIDLString prevSearchString;
+    PRUint32 searchStrLen = nsCRT::strlen(searchStr);
+    nsresult rv;
+
+    rv = previousSearchResult->GetSearchString(getter_Copies(prevSearchString));
+    if (NS_FAILED(rv))
+        return NS_ERROR_FAILURE;
+    
+    if (!(const PRUnichar*)prevSearchString)
+        return NS_ERROR_FAILURE;
+    
+    PRUint32 prevSearchStrLen = nsCRT::strlen(prevSearchString);
+    if (searchStrLen < prevSearchStrLen || nsCRT::strncasecmp(searchStr, prevSearchString, prevSearchStrLen != 0))
+        return NS_ERROR_ABORT;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = previousSearchResult->GetItems(getter_AddRefs(array));
+
+    if (NS_FAILED(rv)) return rv;
+    
+    PRUint32 nbrOfItems;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    if (NS_FAILED(rv) || nbrOfItems <= 0)
+        return NS_ERROR_FAILURE;
+        
+    nsCOMPtr<nsISupports> item;
+    nsCOMPtr<nsIAutoCompleteItem> resultItem;
+        
+    // XXX I don't understand the purpose of this loop!
+    for (i = 0; i < nbrOfItems; i ++) {
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+
+        // nsCAutoString itemAutoStr;
+        // itemAutoStr.AssignWithConversion(itemValue);
+        // printf("SearchPreviousResults::Comparing %s with %s \n", searchAutoStr.ToNewCString(), itemAutoStr.get());
+        if (!(const PRUnichar*)itemValue)
+            continue;
+            
+        if (nsCRT::strncasecmp(searchStr, itemValue, searchStrLen) == 0)
+            continue;
+			
+    }
+    
+    return NS_OK;
+}
+#endif
+
+NS_IMETHODIMP
+nsUrlbarHistory::SearchCache(nsAReadableString& searchStr,
+                             nsIAutoCompleteResults* results)
+{
+    nsresult rv = NS_OK;
+	nsCOMPtr<nsISimpleEnumerator>  entries;
+
+    //printf("******** In SearchCache *******\n");
+	
+	PRInt32  protocolIndex=-1;
+    nsAutoString searchProtocol, searchPath;
+    PRInt32 searchPathIndex, searchStrLength;
+
+    // Get the length of the search string
+    searchStrLength = searchStr.Length();
+    // Check if there is any protocol present in the 
+    // search string.
+    GetHostIndex(searchStr, &searchPathIndex);
+    if (searchPathIndex > 0) {
+        // There was a protocol in the search string. Strip off
+        // the protocol from the rest of the url  
+        searchStr.Left(searchProtocol, searchPathIndex);
+        searchStr.Mid(searchPath, searchPathIndex, searchStrLength);
+    }
+    else {
+        // There was no protocol in the search string. 
+        searchPath = searchStr;
+    }
+	//printf("Search String is %s path = %s protocol = %s \n", searchStr.ToNewCString(), searchPath.ToNewCString(), searchProtocol.ToNewCString());
+	   
+	if (!gRDFCUtils || !kNC_URLBARHISTORY)
+        return NS_ERROR_FAILURE;
+
+
+	nsCOMPtr<nsIRDFContainer> container;
+    /* Get the elements in the  data source
+     * through the container
+     */
+	rv = gRDFCUtils->MakeSeq(mDataSource,
+                            kNC_URLBARHISTORY,
+                            getter_AddRefs(container));
+
+    NS_ENSURE_TRUE(container, NS_ERROR_FAILURE);
+ 
+    //Get the elements from the container
+    container->GetElements(getter_AddRefs(entries));
+
+    NS_ENSURE_TRUE(entries, NS_ERROR_FAILURE);
+    
+    PRBool moreElements = PR_FALSE;
+    while (NS_SUCCEEDED(entries->HasMoreElements(&moreElements)) && moreElements) {
+       nsCOMPtr<nsISupports>  entry;
+       nsCOMPtr<nsIRDFLiteral>  literal;
+       nsAutoString rdfProtocol, rdfPath;
+       PRInt32 rdfPathIndex, index = -1;
+       nsAutoString match;
+       const PRUnichar * rdfValue = nsnull;   
+
+       rv = entries->GetNext(getter_AddRefs(entry));
+       if (entry) {
+         literal = do_QueryInterface(entry);
+         literal->GetValueConst(&rdfValue);
+       }      
+       if (!rdfValue)
+          continue;
+       nsLiteralString valueStr(rdfValue);
+
+       // Get the index of the hostname in the rdf string
+       GetHostIndex (valueStr, &rdfPathIndex);
+
+       if (rdfPathIndex > 0) {
+          // RDf string has a protocol in it, Strip it off
+          // from the rest of the url;
+          valueStr.Left(rdfProtocol, rdfPathIndex);
+          valueStr.Mid(rdfPath, rdfPathIndex, valueStr.Length());
+       }
+       else {
+          // There was no protocol.
+          rdfPath = valueStr;
+       }
+       //printf("RDFString is %s path = %s protocol = %s\n", valueStr.ToNewCString(), rdfPath.ToNewCString(), rdfProtocol.ToNewCString());
+       // We have all the data we need. Let's do the comparison
+       // We compare the path first and compare the protocol next
+       index = rdfPath.Find(searchPath, PR_TRUE);       
+       if (index == 0) {
+           // The paths match. Now let's compare protocols
+           if (searchProtocol.Length() && rdfProtocol.Length()) {
+              // Both the strings have a protocol part. Compare them.
+              protocolIndex = rdfProtocol.Find(searchProtocol);
+              if (protocolIndex == 0) {
+                  // Both protocols match. We found a result item
+                  match = valueStr;
+              } 
+           } 
+           else if (searchProtocol.Length() && (rdfProtocol.Length() <= 0)) {
+               /* The searchString has a protocol but the rdf string doesn't
+                * Check if the searchprotocol is the default "http://". If so,
+                * prepend the searchProtocol to the rdfPath and provide that as 
+                * the result. Otherwise we don't have a match
+                */
+               // XXX I guess  hard-coded "http://" is OK, since netlib considers
+               // all urls to be char *
+               if ((searchProtocol.Find("http://", PR_TRUE)) == 0) {
+                  match = searchProtocol + rdfPath;
+               }
+           }
+           else if ((searchProtocol.Length() <=0) && rdfProtocol.Length() ||
+                    (searchProtocol.Length() <=0) && (rdfProtocol.Length() <= 0)) {
+               /* Provide the rdfPath (no protocol, just the www.xyz.com/... part) 
+                * as the result for the following 2 cases.
+                * a) searchString has no protocol but rdfString has protocol
+                * b) Both searchString and rdfString don't have a protocol
+                */ 
+               match = rdfPath;
+           }           
+       }  // (index == 0)
+
+      
+	   
+       if (!match.IsEmpty()) {		   
+           /* We have a result item.
+            * First make sure that the value is not already
+            * present in the results array. If we have  
+            * www.mozilla.org and http://www.mozilla.org as unique addresses
+            * in the history and due to the algorithm we follow above to find a match,
+            * when the user user types, http://www.m, we would have 2 matches, both being,
+            * http://www.mozilla.org. So, before adding an entry as a result,
+            * make sure it is not already present in the resultarray
+            */
+           PRBool itemPresent = PR_FALSE;
+           rv = CheckItemAvailability(match, results, &itemPresent);
+           if (itemPresent) {
+               continue;
+           }
+           //Create an AutoComplete Item 
+		   nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+		   NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);
+           
+           newItem->SetValue(match.get());
+           nsCOMPtr<nsISupportsArray> array;
+           rv = results->GetItems(getter_AddRefs(array));
+           if (NS_SUCCEEDED(rv))
+		   { 
+			  // printf("Appending element %s to the results array\n", item->ToNewCString());
+                array->AppendElement((nsISupports*)newItem);
+		   }	
+           /* The result may be much more than what was asked for. For example
+            * the user types http://www.moz and we had http://www.mozilla.org/sidebar
+            * as an entry in the history. This will match our selection criteria above
+            * above and will be provided as result. But the user may actually want to 
+            * go to http://www.mozilla.org. If we are such a situation, offer
+            * http://www.mozilla.org (The first part of the result string http://www.mozilla.org/sidebar)
+            * as a result option(probably the default result).
+            */
+            rv = VerifyAndCreateEntry(searchStr, match, results);
+	   }   
+
+    }    // while 
+    return rv;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn)
+{
+    if (!aReturn)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 slashIndex=-1;    
+    nsresult rv;
+    
+    nsCOMPtr<nsIURL> pathURL=do_CreateInstance(kStandardURLCID, &rv);
+    if (pathURL) {
+       pathURL->SetSpec(NS_ConvertUCS2toUTF8(aPath).get());
+       nsXPIDLCString host, preHost, filePath;
+
+       pathURL->GetHost(getter_Copies(host));
+       pathURL->GetFilePath(getter_Copies(filePath));
+       pathURL->GetPreHost(getter_Copies(preHost));
+       
+       nsAutoString path(aPath);
+       if ((const char*)preHost) 
+           slashIndex  = path.Find(preHost, PR_TRUE);
+       else if ((const char *)host)
+           slashIndex = path.Find(host,PR_TRUE);
+       else if ((const char *)filePath)
+           slashIndex = path.Find(filePath, PR_TRUE);
+       else
+           slashIndex = 0;
+       
+       //printf("$$$$ Scheme for uri = %s, preHost = %s, filepath = %s, Host = %s HostIndex = %d\n", pathScheme, preHost, filePath, pathHost, *aReturn);
+    }
+
+    *aReturn = slashIndex;
+
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::CheckItemAvailability(nsAReadableString& aItem,
+                                       nsIAutoCompleteResults * aArray,
+                                       PRBool * aResult)
+{
+    if (!aArray)
+        return PR_FALSE;
+    
+    nsresult rv;
+    *aResult = PR_FALSE;
+
+    nsCOMPtr<nsISupportsArray> array;
+    rv = aArray->GetItems(getter_AddRefs(array));
+
+    // no item array, just return false;
+    if (NS_FAILED(rv)) return NS_OK;
+
+    PRUint32 nbrOfItems=0;
+    PRUint32 i;
+        
+    rv = array->Count(&nbrOfItems);
+    // If there is no item found in the array, return false
+    if (nbrOfItems <= 0)
+        return NS_OK;
+        
+    nsCOMPtr <nsIAutoCompleteItem> resultItem;
+    for (i = 0; i < nbrOfItems; i ++) {
+
+        rv = array->QueryElementAt(i, NS_GET_IID(nsIAutoCompleteItem),
+                                   getter_AddRefs(resultItem));
+        if (NS_FAILED(rv))
+            return NS_ERROR_FAILURE;
+
+        nsXPIDLString itemValue;
+        resultItem->GetValue(getter_Copies(itemValue));
+        // Using nsIURI to do comparisons didn't quite work out.
+        // So use nsCRT methods
+        if (aItem.Equals(itemValue))
+            {
+                //printf("In CheckItemAvailability. Item already found\n");
+                *aResult = PR_TRUE;
+                break;
+            }
+    }  // for
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::VerifyAndCreateEntry(nsAReadableString& aSearchItem,
+                                      nsString& aMatchStr,
+                                      nsIAutoCompleteResults * aResultArray)
+{
+    if (!aResultArray)
+        return NS_ERROR_FAILURE;
+
+    PRInt32 searchStrLen = aSearchItem.Length();
+    nsresult rv;
+    nsCOMPtr<nsIURL>  searchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (searchURL) {
+        searchURL->SetSpec(NS_ConvertUCS2toUTF8(aSearchItem).get());
+        nsXPIDLCString filePath;
+        searchURL->GetFilePath(getter_Copies(filePath));
+        // Don't bother checking for hostname if the search string
+        // already has a filepath;
+        if (filePath && (nsCRT::strlen(filePath) > 1)) {
+            return NS_OK;
+        }
+    }
+          
+    nsCOMPtr<nsIURL> matchURL = do_CreateInstance(kStandardURLCID, &rv);
+    if (matchURL) {
+        matchURL->SetSpec(NS_ConvertUCS2toUTF8(aMatchStr).get());
+        nsXPIDLCString filePath;
+        matchURL->GetFilePath(getter_Copies(filePath));
+        // If the match string doesn't have a filepath
+        // we need to do nothing here,  return.
+        if (!filePath || (filePath && (nsCRT::strlen(filePath) <=1)))
+            return NS_OK;
+        
+        // Find the position of the filepath in the result string
+        PRInt32 slashIndex = aMatchStr.Find("/", PR_FALSE, searchStrLen);
+        // Extract the host name
+        nsAutoString hostName;
+        aMatchStr.Left(hostName, slashIndex);
+        //printf("#### Host Name is %s\n", hostName.ToNewCString());
+        // Check if this host is already present in the result array
+        // If not add it to the result array
+        PRBool itemAvailable = PR_TRUE;
+        CheckItemAvailability(hostName, aResultArray, &itemAvailable);
+        if (!itemAvailable) {
+            // Insert the host name to the result array at the top
+            //Create an AutoComplete Item 
+		    nsCOMPtr<nsIAutoCompleteItem> newItem(do_CreateInstance(NS_AUTOCOMPLETEITEM_CONTRACTID));
+            NS_ENSURE_TRUE(newItem, NS_ERROR_FAILURE);            
+            newItem->SetValue(hostName.GetUnicode());
+            nsCOMPtr<nsISupportsArray> array;
+            rv = aResultArray->GetItems(getter_AddRefs(array));
+            // Always insert the host entry at the top of the array
+            if (NS_SUCCEEDED(rv)) {
+                array->InsertElementAt(newItem, 0);
+            }
+        }       
+    }
+    return NS_OK;
+}
+
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnStopLookup()
+{
+    printf("nsUrlbarHistory::OnStopLookup()\n");
+    return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::OnAutoComplete(const PRUnichar *searchString,
+                                nsIAutoCompleteResults *previousSearchResult,
+                                nsIAutoCompleteListener *listener)
+{
+#if 1
+    printf("nsUrlbarHistory::OnAutoComplete(%s)\n", NS_ConvertUCS2toUTF8(searchString));
+#endif
+	return NS_OK;
+}
+
+NS_IMETHODIMP
+nsUrlbarHistory::Observe(nsISupports *aSubject, const PRUnichar *aTopic,
+                         const PRUnichar *aSomeData)
+{
+    nsresult rv;
+    
+    if (nsCRT::strcmp(aTopic, NS_LITERAL_STRING("nsPref:changed").get())==0) {
+        
+        nsCOMPtr<nsIPref> prefs=do_QueryInterface(aSubject, &rv);
+        if (NS_SUCCEEDED(rv))
+            prefs->GetBoolPref(PREF_AUTOCOMPLETE_ENABLED, &mEnabled);
+
+    }
+    return NS_OK;
+}

mozilla/xpfe/components/urlbarhistory/src/nsUrlbarHistory.h

@@ -0,0 +1,68 @@
+/* -*- Mode: IDL; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Mozilla browser.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications, Inc.  Portions created by Netscape are
+ * Copyright (C) 1999, Mozilla.  All Rights Reserved.
+ * 
+ * Contributor(s):
+ *   Radha Kulkarni <radha@netscape.com>
+ */
+
+#ifndef nsUrlbarHistory_h
+#define nsUrlbarHistory_h
+
+// Helper Classes
+#include "nsCOMPtr.h"
+
+//Interfaces Needed
+#include "nsIUrlbarHistory.h"
+#include "nsIAutoCompleteSession.h"
+#include "nsIObserver.h"
+#include "nsVoidArray.h"
+#include "nsIRDFService.h"
+#include "nsIRDFDataSource.h"
+#include "nsRDFCID.h"
+
+class nsUrlbarHistory: public nsIUrlbarHistory,
+                       public nsIObserver,
+                       public nsIAutoCompleteSession
+{
+public:
+	nsUrlbarHistory();
+
+	NS_DECL_ISUPPORTS
+	NS_DECL_NSIURLBARHISTORY
+    NS_DECL_NSIOBSERVER
+	NS_DECL_NSIAUTOCOMPLETESESSION
+
+protected:
+   virtual ~nsUrlbarHistory();
+
+#if 0
+   NS_IMETHOD SearchPreviousResults(const PRUnichar *, nsIAutoCompleteResults *);
+#endif
+   NS_IMETHOD SearchCache(nsAReadableString&, nsIAutoCompleteResults *);
+   NS_IMETHOD GetHostIndex(nsAReadableString& aPath, PRInt32 * aReturn);
+   NS_IMETHOD CheckItemAvailability(nsAReadableString& aItem, nsIAutoCompleteResults * aArray, PRBool * aResult);
+   NS_IMETHOD VerifyAndCreateEntry(nsAReadableString& aItem, nsString& aMatchItem, nsIAutoCompleteResults * aArray);
+
+private:
+	nsStringArray  mIgnoreArray;
+	nsCOMPtr<nsIRDFDataSource> mDataSource;
+    PRBool mEnabled;
+};
+
+
+#endif   /* nsUrlbarHistory */