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

chrome/browser/ui/browser_instant_controller_unittest.cc

Index: chrome/browser/ui/browser_instant_controller_unittest.cc
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc
index 5fcfcbdeae99f6c862c3bffdd980923d5acb1c85..975063a81d490a964879c61330fec063f5310d3b 100644
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -141,11 +141,10 @@ TEST_F(BrowserInstantControllerTest, DefaultSearchProviderChanged) {
 
     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.
@@ -185,11 +184,10 @@ TEST_F(BrowserInstantControllerTest, GoogleBaseURLUpdated) {
     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())