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

chrome/browser/sessions/session_restore.cc

 // Copyright 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/sessions/session_restore.h"
 
 #include <algorithm>
 #include <list>
 #include <set>
 #include <string>
@@ skipping 762 matching lines @@
   return restorer->Restore();
 }
 
 // static
 void SessionRestore::RestoreSessionAfterCrash(Browser* browser) {
    uint32 behavior = 0;
   if (browser->tab_strip_model()->count() == 1) {
     const content::WebContents* active_tab =
         browser->tab_strip_model()->GetWebContentsAt(0);
     if (active_tab->GetURL() == GURL(chrome::kChromeUINewTabURL) ||
-        chrome::IsInstantNTP(active_tab)) {
+        search::IsInstantNTP(active_tab)) {
       // There is only one tab and its the new tab page, make session restore
       // clobber it.
       behavior = SessionRestore::CLOBBER_CURRENT_TAB;
     }
   }
   SessionRestore::RestoreSession(browser->profile(), browser,
                                  browser->host_desktop_type(), behavior,
                                  std::vector<GURL>());
 }
 
@@ skipping 64 matching lines @@
   if (prioritize_tabs == "mru")
     return SMART_RESTORE_MODE_MRU;
   if (prioritize_tabs == "simple")
     return SMART_RESTORE_MODE_SIMPLE;
   return SMART_RESTORE_MODE_OFF;
 }
 
 // static
 base::CallbackList<void(int)>*
     SessionRestore::on_session_restored_callbacks_ = nullptr;