Enable autocomplete in urlbar.

xpfe/browser/resources/content/navigator.xul

@@ -253,10 +253,10 @@ Contributor(s): ______________________________________. -->
          
           <box autostretch="never" valign="middle" flex="1">
       			<image id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/> 
-            <textfield class="plain chromeclass-location" id="urlbar" flex="1"
+           <!--<textfield class="plain chromeclass-location" id="urlbar" flex="1"
                        onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }"
-                       tooltiptext="&locationBar.tooltip;"/>
-			<!--<autocomplete class="plain chromeclass-location" searchSessionType="urlbar" id="urlbar" onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/> -->
+                       tooltiptext="&locationBar.tooltip;"/> -->
+			<textfield autocomplete="true" timeout="300" class="plain chromeclass-location" searchSessionType="urlbar" id="urlbar" onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>  
             <button class="button-toolbar-3" id="search-button" value="&searchButton.label;" 
                     oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);" 
                     tooltiptext="&searchButton.tooltip;"/> 

xpfe/browser/src/nsBrowserInstance.cpp

@@ -889,7 +889,7 @@ nsBrowserInstance::SetContentWindow(nsIDOMWindow* aWin)
 
   mContentWindow = aWin;
   // NS_ADDREF(aWin); WE DO NOT OWN THIS
-
+  nsresult rv;
 
   // we do not own the script context, so don't addref it
   nsCOMPtr<nsIScriptGlobalObject> globalObj(do_QueryInterface(aWin));
@@ -930,10 +930,10 @@ nsBrowserInstance::SetContentWindow(nsIDOMWindow* aWin)
     if (APP_DEBUG) {
       printf("Attaching to Content WebShell [%s]\n", (const char *)str);
     }
-    nsCOMPtr<nsIUrlbarHistory>  ubHistory(do_CreateInstance(NS_URLBARHISTORY_PROGID));
+    nsCOMPtr<nsIUrlbarHistory>  ubHistory = do_GetService(NS_URLBARHISTORY_PROGID, &rv);
+	
 	NS_ENSURE_TRUE(ubHistory, NS_ERROR_FAILURE);
 	mUrlbarHistory = ubHistory;
-
   }
 
   return NS_OK;