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

chrome/browser/ui/singleton_tabs.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 "chrome/browser/ui/singleton_tabs.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
@@ skipping 31 matching lines @@
 }
 
 void ShowSingletonTabOverwritingNTP(Browser* browser,
                                     const NavigateParams& params) {
   DCHECK(browser);
   NavigateParams local_params(params);
   content::WebContents* contents =
       browser->tab_strip_model()->GetActiveWebContents();
   if (contents) {
     const GURL& contents_url = contents->GetURL();
-    if ((contents_url == GURL(kChromeUINewTabURL) || IsInstantNTP(contents) ||
+    if ((contents_url == GURL(kChromeUINewTabURL) ||
+         search::IsInstantNTP(contents) ||
          contents_url == GURL(url::kAboutBlankURL)) &&
         GetIndexOfSingletonTab(&local_params) < 0) {
       local_params.disposition = CURRENT_TAB;
     }
   }
 
   Navigate(&local_params);
 }
 
 NavigateParams GetSingletonTabNavigateParams(Browser* browser,
@@ skipping 59 matching lines @@
                                     replacements)) {
       params->target_contents = tab;
       return tab_index;
     }
   }
 
   return -1;
 }
 
 }  // namespace chrome