Revert of Updates the mic icon status based on the device's audio state.

chrome/browser/ui/app_list/search/search_resource_manager.cc

Index: chrome/browser/ui/app_list/search/search_resource_manager.cc
diff --git a/chrome/browser/ui/app_list/search/search_resource_manager.cc b/chrome/browser/ui/app_list/search/search_resource_manager.cc
index f83f15bde73c3f998a02c5525b165b787791ade5..4c6a1c1255276eeb4c1719a4802b868f20ba23e9 100644
--- a/chrome/browser/ui/app_list/search/search_resource_manager.cc
+++ b/chrome/browser/ui/app_list/search/search_resource_manager.cc
@@ -15,23 +15,6 @@
 
 namespace app_list {
 
-namespace {
-
-scoped_ptr<SearchBoxModel::SpeechButtonProperty> CreateNewProperty(
-    SpeechRecognitionState state) {
-  if (state == SPEECH_RECOGNITION_OFF)
-    return nullptr;
-
-  ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
-  return make_scoped_ptr(new SearchBoxModel::SpeechButtonProperty(
-      *bundle.GetImageSkiaNamed(IDR_OMNIBOX_MIC_SEARCH),
-      l10n_util::GetStringUTF16(IDS_APP_LIST_HOTWORD_LISTENING),
-      *bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_OFF),
-      l10n_util::GetStringUTF16(IDS_APP_LIST_START_SPEECH_RECOGNITION)));
-}
-
-}  // namespace
-
 SearchResourceManager::SearchResourceManager(Profile* profile,
                                              SearchBoxModel* search_box,
                                              SpeechUIModel* speech_ui)
@@ -41,6 +24,18 @@
 
   ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
   search_box_->SetIcon(*bundle.GetImageSkiaNamed(IDR_OMNIBOX_SEARCH));
+  StartPageService* service = StartPageService::Get(profile);
+  if (service && service->GetSpeechRecognitionContents()) {
+    search_box_->SetSpeechRecognitionButton(
+        scoped_ptr<SearchBoxModel::SpeechButtonProperty>(
+            new SearchBoxModel::SpeechButtonProperty(
+                *bundle.GetImageSkiaNamed(IDR_OMNIBOX_MIC_SEARCH),
+                l10n_util::GetStringUTF16(
+                    IDS_APP_LIST_HOTWORD_LISTENING),
+                *bundle.GetImageSkiaNamed(IDR_APP_LIST_MIC_HOTWORD_OFF),
+                l10n_util::GetStringUTF16(
+                    IDS_APP_LIST_START_SPEECH_RECOGNITION))));
+  }
   OnSpeechRecognitionStateChanged(speech_ui_->state());
 }
 
@@ -53,7 +48,6 @@
   search_box_->SetHintText(l10n_util::GetStringUTF16(
       (new_state == SPEECH_RECOGNITION_HOTWORD_LISTENING) ?
       IDS_SEARCH_BOX_HOTWORD_HINT : IDS_SEARCH_BOX_HINT));
-  search_box_->SetSpeechRecognitionButton(CreateNewProperty(new_state));
 }
 
 }  // namespace app_list