Flag-flip of app-list-voice-search (2)

chrome/browser/ui/app_list/start_page_service.cc

 // Copyright 2013 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/app_list/start_page_service.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "extensions/common/extension.h"
 #include "ui/app_list/app_list_switches.h"
 
 namespace app_list {
 
 class StartPageService::Factory : public BrowserContextKeyedServiceFactory {
  public:
   static StartPageService* GetForProfile(Profile* profile) {
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (!command_line->HasSwitch(::switches::kShowAppListStartPage) &&
-        !command_line->HasSwitch(app_list::switches::kEnableVoiceSearch)) {
+    if (!CommandLine::ForCurrentProcess()->HasSwitch(
+            ::switches::kShowAppListStartPage) &&
+        !app_list::switches::IsVoiceSearchEnabled()) {
       return NULL;
     }
 
     return static_cast<StartPageService*>(
         GetInstance()->GetServiceForBrowserContext(profile, true));
   }
 
   static Factory* GetInstance() {
     return Singleton<Factory>::get();
   }
@@ skipping 108 matching lines @@
   contents_->GetWebUI()->CallJavascriptFunction(
       "appList.startPage.toggleSpeechRecognition");
 }
 
 content::WebContents* StartPageService::GetStartPageContents() {
   return CommandLine::ForCurrentProcess()->HasSwitch(
       ::switches::kShowAppListStartPage) ? contents_.get() : NULL;
 }
 
 content::WebContents* StartPageService::GetSpeechRecognitionContents() {
-  // Speech recognition is available if either of start-page or voice-search
-  // is enabled.
-  return contents_.get();
+  return app_list::switches::IsVoiceSearchEnabled() ? contents_.get() : NULL;
 }
 
 void StartPageService::OnSpeechResult(
     const base::string16& query, bool is_final) {
   FOR_EACH_OBSERVER(StartPageObserver,
                     observers_,
                     OnSpeechResult(query, is_final));
 }
 
 void StartPageService::OnSpeechSoundLevelChanged(int16 level) {
   FOR_EACH_OBSERVER(StartPageObserver,
                     observers_,
                     OnSpeechSoundLevelChanged(level));
 }
 
 void StartPageService::OnSpeechRecognitionStateChanged(
     SpeechRecognitionState new_state) {
   FOR_EACH_OBSERVER(StartPageObserver,
                     observers_,
                     OnSpeechRecognitionStateChanged(new_state));
 }
 
 void StartPageService::Shutdown() {
   contents_.reset();
 }
 
 }  // namespace app_list