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

chrome/browser/ui/browser_instant_controller_unittest.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 <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/field_trial.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 123 matching lines @@
 
   SetUserSelectedDefaultSearchProvider("https://bar.com/");
 
   for (size_t i = 0; i < num_tests; ++i) {
     FakeWebContentsObserver* observer = observers[i];
     const TabReloadTestCase& test =
         kTabReloadTestCasesFinalProviderNotGoogle[i];
 
     if (test.should_reload) {
       // Validate final instant state.
-      EXPECT_EQ(
-          test.end_in_instant_process,
-          chrome::ShouldAssignURLToInstantRenderer(
-              observer->current_url(), profile()))
-        << test.description;
+      EXPECT_EQ(test.end_in_instant_process,
+                search::ShouldAssignURLToInstantRenderer(
+                    observer->current_url(), profile()))
+          << test.description;
     }
 
     // Ensure only the expected tabs(contents) reloaded.
     EXPECT_EQ(test.should_reload ? 1 : 0, observer->num_reloads())
       << test.description;
 
     if (test.end_in_local_ntp) {
       EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), observer->current_url())
           << test.description;
     }
@@ skipping 19 matching lines @@
     observers.push_back(new FakeWebContentsObserver(contents));
   }
 
   NotifyGoogleBaseURLUpdate("https://www.google.es/");
 
   for (size_t i = 0; i < num_tests; ++i) {
     const TabReloadTestCase& test = kTabReloadTestCasesFinalProviderGoogle[i];
     FakeWebContentsObserver* observer = observers[i];
 
     // Validate final instant state.
-    EXPECT_EQ(
-        test.end_in_instant_process,
-        chrome::ShouldAssignURLToInstantRenderer(
-            observer->current_url(), profile()))
-      << test.description;
+    EXPECT_EQ(test.end_in_instant_process,
+              search::ShouldAssignURLToInstantRenderer(observer->current_url(),
+                                                       profile()))
+        << test.description;
 
     // Ensure only the expected tabs(contents) reloaded.
     EXPECT_EQ(test.should_reload ? 1 : 0, observer->num_reloads())
       << test.description;
 
     if (test.end_in_local_ntp) {
       EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), observer->current_url())
           << test.description;
       // The navigation to Local NTP should be definitive i.e. can't go back.
       EXPECT_FALSE(observer->can_go_back());
@@ skipping 13 matching lines @@
 
   browser.reset(NULL);
   window.reset(NULL);
   EXPECT_FALSE(IsInstantServiceObserver(bic))
     << "New BrowserInstantController should register as InstantServiceObserver";
 }
 
 }  // namespace
 
 }  // namespace chrome