Initial implementation of dedupping search provider's URLs.

chrome/browser/autocomplete/autocomplete_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/format_macros.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_input.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
@@ skipping 13 matching lines @@
                                      UTF16ToUTF8(match.contents).c_str(),
                                      match.provider->GetName()));
   }
   return UTF8ToUTF16(output);
 }
 
 }  // namespace
 
 class AutocompleteBrowserTest : public ExtensionBrowserTest {
  protected:
+  void WaitForTemplateURLServiceToLoad() {
+    ui_test_utils::WaitForTemplateURLServiceToLoad(
+      TemplateURLServiceFactory::GetForProfile(browser()->profile()));
+  }
+
   LocationBar* GetLocationBar() const {
     return browser()->window()->GetLocationBar();
   }
 
   AutocompleteController* GetAutocompleteController() const {
     return GetLocationBar()->GetLocationEntry()->model()->popup_model()->
         autocomplete_controller();
   }
 };
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, Basic) {
+  WaitForTemplateURLServiceToLoad();
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* location_entry = location_bar->GetLocationEntry();
 
   EXPECT_TRUE(location_bar->GetInputString().empty());
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
   // TODO(phajdan.jr): check state of IsSelectAll when it's consistent across
   // platforms.
 
   location_bar->FocusLocation(true);
 
@@ skipping 23 matching lines @@
 
 // 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) {
+  WaitForTemplateURLServiceToLoad();
   // The results depend on the history backend being loaded. Make sure it is
   // loaded so that the autocomplete results are consistent.
   ui_test_utils::WaitForHistoryToLoad(
       HistoryServiceFactory::GetForProfile(browser()->profile(),
                                            Profile::EXPLICIT_ACCESS));
 
   LocationBar* location_bar = GetLocationBar();
   AutocompleteController* autocomplete_controller = GetAutocompleteController();
 
   {
@@ skipping 23 matching lines @@
 
     EXPECT_TRUE(location_bar->GetInputString().empty());
     EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
     EXPECT_FALSE(location_entry->IsSelectAll());
     const AutocompleteResult& result = autocomplete_controller->result();
     EXPECT_TRUE(result.empty()) << AutocompleteResultAsString(result);
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, TabAwayRevertSelect) {
+  WaitForTemplateURLServiceToLoad();
   // http://code.google.com/p/chromium/issues/detail?id=38385
   // Make sure that tabbing away from an empty omnibar causes a revert
   // and select all.
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* location_entry = location_bar->GetLocationEntry();
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
   location_entry->SetUserText(string16());
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
   chrome::AddSelectedTabWithURL(browser(), GURL(chrome::kAboutBlankURL),
                                 content::PAGE_TRANSITION_AUTO_TOPLEVEL);
   observer.Wait();
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
   chrome::CloseTab(browser());
   EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
   EXPECT_TRUE(location_entry->IsSelectAll());
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, FocusSearch) {
+  WaitForTemplateURLServiceToLoad();
   LocationBar* location_bar = GetLocationBar();
   OmniboxView* location_entry = location_bar->GetLocationEntry();
 
   // Focus search when omnibox is blank
   {
     EXPECT_TRUE(location_bar->GetInputString().empty());
     EXPECT_EQ(UTF8ToUTF16(chrome::kAboutBlankURL), location_entry->GetText());
 
     location_bar->FocusSearch();
     EXPECT_TRUE(location_bar->GetInputString().empty());
@@ skipping 66 matching lines @@
     EXPECT_EQ(ASCIIToUTF16("   ?foo"), location_entry->GetText());
 
     size_t selection_start, selection_end;
     location_entry->GetSelectionBounds(&selection_start, &selection_end);
     EXPECT_EQ(4U, std::min(selection_start, selection_end));
     EXPECT_EQ(7U, std::max(selection_start, selection_end));
   }
 }
 
 IN_PROC_BROWSER_TEST_F(AutocompleteBrowserTest, ExtensionAppProvider) {
+  WaitForTemplateURLServiceToLoad();
   ExtensionService* service = browser()->profile()->GetExtensionService();
   size_t extension_count = service->extensions()->size();
 
   FilePath test_dir;
   ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_dir));
   // Load a packaged app.
   extensions::UnpackedInstaller::Create(service)->Load(
       test_dir.AppendASCII("extensions").AppendASCII("packaged_app"));
   WaitForExtensionLoad();
   // Load a hosted app.
@@ skipping 36 matching lines @@
     EXPECT_TRUE(autocomplete_controller->done());
     const AutocompleteResult& result = autocomplete_controller->result();
     // 'App test' is also a substring of extension 'Packaged App Test'.
     EXPECT_GT(result.size(), 2U) << AutocompleteResultAsString(result);
     AutocompleteMatch match = result.match_at(0);
     EXPECT_EQ(ASCIIToUTF16("App Test"), match.contents);
     EXPECT_EQ(AutocompleteMatch::EXTENSION_APP, match.type);
     EXPECT_FALSE(match.deletable);
   }
 }