1 files changed, 12 insertions, 18 deletions

diff --git a/chrome/browser/ui/search/search_tab_helper.cc b/chrome/browser/ui/search/search_tab_helper.cc
index d28404f..400a1b4 100644
--- a/chrome/browser/ui/search/search_tab_helper.cc
+++ b/chrome/browser/ui/search/search_tab_helper.cc
@@ -11,7 +11,7 @@
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
-DEFINE_WEB_CONTENTS_USER_DATA_KEY(chrome::search::SearchTabHelper);
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchTabHelper);
 
 namespace {
 
@@ -23,21 +23,18 @@ bool IsNTP(const content::WebContents* contents) {
   if (entry && entry->GetVirtualURL() == GURL(chrome::kChromeUINewTabURL))
     return true;
 
-  return chrome::search::IsInstantNTP(contents);
+  return chrome::IsInstantNTP(contents);
 }
 
 bool IsSearchResults(const content::WebContents* contents) {
-  return !chrome::search::GetSearchTerms(contents).empty();
+  return !chrome::GetSearchTerms(contents).empty();
 }
 
 }  // namespace
 
-namespace chrome {
-namespace search {
-
 SearchTabHelper::SearchTabHelper(content::WebContents* web_contents)
     : WebContentsObserver(web_contents),
-      is_search_enabled_(chrome::search::IsInstantExtendedAPIEnabled()),
+      is_search_enabled_(chrome::IsInstantExtendedAPIEnabled()),
       user_input_in_progress_(false),
       web_contents_(web_contents) {
   if (!is_search_enabled_)
@@ -93,18 +90,18 @@ bool SearchTabHelper::OnMessageReceived(const IPC::Message& message) {
 }
 
 void SearchTabHelper::UpdateMode() {
-  Mode::Type type = Mode::MODE_DEFAULT;
-  Mode::Origin origin = Mode::ORIGIN_DEFAULT;
+  SearchMode::Type type = SearchMode::MODE_DEFAULT;
+  SearchMode::Origin origin = SearchMode::ORIGIN_DEFAULT;
   if (IsNTP(web_contents_)) {
-    type = Mode::MODE_NTP;
-    origin = Mode::ORIGIN_NTP;
+    type = SearchMode::MODE_NTP;
+    origin = SearchMode::ORIGIN_NTP;
   } else if (IsSearchResults(web_contents_)) {
-    type = Mode::MODE_SEARCH_RESULTS;
-    origin = Mode::ORIGIN_SEARCH;
+    type = SearchMode::MODE_SEARCH_RESULTS;
+    origin = SearchMode::ORIGIN_SEARCH;
   }
   if (user_input_in_progress_)
-    type = Mode::MODE_SEARCH_SUGGESTIONS;
-  model_.SetMode(Mode(type, origin));
+    type = SearchMode::MODE_SEARCH_SUGGESTIONS;
+  model_.SetMode(SearchMode(type, origin));
 }
 
 void SearchTabHelper::OnSearchBoxShowBars(int page_id) {
@@ -118,6 +115,3 @@ void SearchTabHelper::OnSearchBoxHideBars(int page_id) {
     Send(new ChromeViewMsg_SearchBoxBarsHidden(routing_id()));
   }
 }
-
-}  // namespace search
-}  // namespace chrome