[Hotword] Add error message display back in. Add error messages for NaCl. Add metrics for errors.

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/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/hotword_service.h"
 #include "chrome/common/pref_names.h"
@@ skipping 26 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::RetryHotwordExtension(Profile* profile) {
-  HotwordService* hotword_service = GetForProfile(profile);
-  return hotword_service && hotword_service->RetryHotwordExtension();
+int HotwordServiceFactory::GetCurrentError(BrowserContext* context) {
+  HotwordService* hotword_service = GetForProfile(context);
+  if (!hotword_service)
+    return 0;
+  return hotword_service->error_message();
 }
 
 HotwordServiceFactory::HotwordServiceFactory()
     : BrowserContextKeyedServiceFactory(
         "HotwordService",
         BrowserContextDependencyManager::GetInstance()) {
   // No dependencies.
 }
 
 HotwordServiceFactory::~HotwordServiceFactory() {
@@ skipping 12 matching lines @@
   // also confirm that they wish this preference to be true or opt out of it.
   prefs->RegisterBooleanPref(prefs::kHotwordAudioLoggingEnabled,
                              true,
                              user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
 }
 
 KeyedService* HotwordServiceFactory::BuildServiceInstanceFor(
     BrowserContext* context) const {
   return new HotwordService(Profile::FromBrowserContext(context));
 }