Remove hardware check that enables always-on hotwording.

chrome/browser/search/hotword_service_factory.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/search/hotword_service_factory.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
@@ skipping 28 matching lines @@
   return hotword_service && hotword_service->IsServiceAvailable();
 }
 
 // static
 bool HotwordServiceFactory::IsHotwordAllowed(BrowserContext* context) {
   HotwordService* hotword_service = GetForProfile(context);
   return hotword_service && hotword_service->IsHotwordAllowed();
 }
 
 // static
 bool HotwordServiceFactory::IsHotwordHardwareAvailable() {

[Matt Giuca, 2015/01/15 01:51:21]

I don't like the idea of removing this code; I understand that we'll want it
back at some point in the future, just that we want it disabled for now.

Can we just change this to
#if false
with a comment explaining why it is disabled?

[Anand Mistry (off Chromium), 2015/01/15 02:21:01]

Done.

-#if defined(OS_CHROMEOS)
-  if (chromeos::CrasAudioHandler::IsInitialized()) {
-    chromeos::AudioDeviceList devices;
-    chromeos::CrasAudioHandler::Get()->GetAudioDevices(&devices);
-    for (size_t i = 0; i < devices.size(); ++i) {
-      if (devices[i].type == chromeos::AUDIO_TYPE_AOKR) {
-        DCHECK(devices[i].is_input);
-        return true;
-      }
-    }
-  }
-#endif
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kEnableExperimentalHotwordHardware);
 }
 
 // static
 int HotwordServiceFactory::GetCurrentError(BrowserContext* context) {
   HotwordService* hotword_service = GetForProfile(context);
   if (!hotword_service)
     return 0;
   return hotword_service->error_message();
@@ skipping 61 matching lines @@
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kHotwordAlwaysOnNotificationSeen,
                              false,
                              user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 }
 
 KeyedService* HotwordServiceFactory::BuildServiceInstanceFor(
     BrowserContext* context) const {
   return new HotwordService(Profile::FromBrowserContext(context));
 }