Partially componentize //chrome/browser/search/search.{h,cc}

chrome/browser/ui/search/instant_extended_interactive_uitest.cc

 // Copyright 2013 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 <sstream>
 
 #include "base/command_line.h"
 #include "base/metrics/histogram_base.h"
 #include "base/metrics/histogram_samples.h"
 #include "base/metrics/statistics_recorder.h"
@@ skipping 38 matching lines @@
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/history/core/common/thumbnail_score.h"
 #include "components/omnibox/browser/autocomplete_controller.h"
 #include "components/omnibox/browser/autocomplete_match.h"
 #include "components/omnibox/browser/autocomplete_provider.h"
 #include "components/omnibox/browser/autocomplete_result.h"
 #include "components/omnibox/browser/omnibox_field_trial.h"
 #include "components/omnibox/browser/search_provider.h"
+#include "components/search/search.h"
 #include "components/search_engines/template_url_service.h"
 #include "components/sessions/serialized_navigation_entry.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/url_data_source.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 64 matching lines @@
         on_native_suggestions_calls_(0),
         on_change_calls_(0),
         submit_count_(0),
         on_esc_key_press_event_calls_(0),
         on_focus_changed_calls_(0),
         is_focused_(false),
         on_toggle_voice_search_calls_(0) {
   }
  protected:
   void SetUpInProcessBrowserTestFixture() override {
-    chrome::EnableQueryExtractionForTesting();
+    search::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     GURL ntp_url = https_test_server().GetURL(
         "files/instant_extended_ntp.html?strk=1&");
     InstantTestBase::Init(instant_url, ntp_url, false);
   }
 
   int64 GetHistogramCount(const char* name) {
     base::HistogramBase* histogram =
@@ skipping 94 matching lines @@
 };
 
 class InstantExtendedPrefetchTest : public InstantExtendedTest {
  public:
   InstantExtendedPrefetchTest()
       : factory_(new net::URLFetcherImplFactory()),
         fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
   void SetUpInProcessBrowserTestFixture() override {
-    chrome::EnableQueryExtractionForTesting();
+    search::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     GURL ntp_url = https_test_server().GetURL(
         "files/instant_extended_ntp.html?strk=1&");
     InstantTestBase::Init(instant_url, ntp_url, true);
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitchASCII(
@@ skipping 474 matching lines @@
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(active_tab->GetController().CanGoBack());
   content::WindowedNotificationObserver load_stop_observer_2(
       content::NOTIFICATION_LOAD_STOP,
       content::Source<content::NavigationController>(
           &active_tab->GetController()));
   active_tab->GetController().GoBack();
   load_stop_observer_2.Wait();
 
   active_tab = browser()->tab_strip_model()->GetActiveWebContents();
-  EXPECT_TRUE(chrome::IsInstantNTP(active_tab));
+  EXPECT_TRUE(search::IsInstantNTP(active_tab));
 }
 
 // Flaky: crbug.com/267119
 IN_PROC_BROWSER_TEST_F(InstantExtendedTest,
                        DISABLED_DispatchMVChangeEventWhileNavigatingBackToNTP) {
   // Setup Instant.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
   FocusOmnibox();
 
   // Open new tab.
@@ skipping 209 matching lines @@
   stream << "link.href = \"" << result_url.spec() << "\";";
   stream << "document.body.appendChild(link);";
   stream << "link.click();";
   EXPECT_TRUE(content::ExecuteScript(contents, stream.str()));
 
   content::WaitForLoadStop(contents);
   std::string expected_title =
       "Referrer is " + instant_url().GetWithEmptyPath().spec();
   EXPECT_EQ(ASCIIToUTF16(expected_title), contents->GetTitle());
 }