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

chrome/browser/ui/bookmarks/bookmark_utils.cc

Index: chrome/browser/ui/bookmarks/bookmark_utils.cc
diff --git a/chrome/browser/ui/bookmarks/bookmark_utils.cc b/chrome/browser/ui/bookmarks/bookmark_utils.cc
index 0956cc020e5c11b78244eaf0bd76172c04fdc725..f2f4bc17963136bab90a2520711000b987a3559e 100644
--- a/chrome/browser/ui/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_utils.cc
@@ -295,8 +295,8 @@ bool HasBookmarkURLsAllowedInIncognitoMode(
 
 GURL GetURLToBookmark(content::WebContents* web_contents) {
   DCHECK(web_contents);
-  return IsInstantNTP(web_contents) ?
-      GURL(kChromeUINewTabURL) : web_contents->GetURL();
+  return search::IsInstantNTP(web_contents) ? GURL(kChromeUINewTabURL)
+                                            : web_contents->GetURL();
 }
 
 void GetURLAndTitleToBookmark(content::WebContents* web_contents,
@@ -342,7 +342,7 @@ bool IsAppsShortcutEnabled(Profile* profile,
   if (host_desktop_type == chrome::HOST_DESKTOP_TYPE_ASH)
     return false;
 
-  return chrome::IsInstantExtendedAPIEnabled() && !profile->IsOffTheRecord();
+  return search::IsInstantExtendedAPIEnabled() && !profile->IsOffTheRecord();
 }
 
 bool ShouldShowAppsShortcutInBookmarkBar(