Some fixes split off from https://chromiumcodereview.appspot.com/9570064/ to...

Some fixes split off from https://chromiumcodereview.appspot.com/9570064/ to try and make the omnibox_view_browsertest.cc tests less flaky and make it possible to use the HQP in them.

BUG=none
TEST=none
TBR=mrossetti
Review URL: https://chromiumcodereview.appspot.com/9586012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124681 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autocomplete/autocomplete_browsertest.cc

@@ -28,15 +28,6 @@
 #include "content/public/browser/notification_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-// Autocomplete test is flaky on ChromeOS.
-// http://crbug.com/52928
-#if defined(OS_CHROMEOS)
-#define MAYBE_Autocomplete DISABLED_Autocomplete
-#else
-#define MAYBE_Autocomplete Autocomplete
-#endif
-
-
 namespace {
 
 string16 AutocompleteResultAsString(const AutocompleteResult& result) {
@@ -103,6 +94,14 @@ IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
   EXPECT_FALSE(location_bar->location_entry()->IsSelectAll());
 }
 
+// Autocomplete test is flaky on ChromeOS.
+// http://crbug.com/52928
+#if defined(OS_CHROMEOS)
+#define MAYBE_Autocomplete DISABLED_Autocomplete
+#else
+#define MAYBE_Autocomplete Autocomplete
+#endif
+
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, MAYBE_Autocomplete) {
   // The results depend on the history backend being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.

chrome/browser/history/history_backend.cc

@@ -794,8 +794,10 @@ void HistoryBackend::AddPagesWithDetails(const URLRows& urls,
         return;
       }
 
-      if (i->typed_count() > 0)
+      if (i->typed_count() > 0) {
         modified->changed_urls.push_back(*i);
+        modified->changed_urls.back().set_id(url_id);  // *i likely has |id_| 0.
+      }
     }
 
     // Add the page to the full text index. This function is also used for