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

chrome/browser/search/hotword_service_factory.h

Index: chrome/browser/search/hotword_service_factory.h
diff --git a/chrome/browser/search/hotword_service_factory.h b/chrome/browser/search/hotword_service_factory.h
index 97a1d13623f7a8982cbc884e8729e3642ac7528b..3840cf50821dd358b921a9709d65a1b5df228734 100644
--- a/chrome/browser/search/hotword_service_factory.h
+++ b/chrome/browser/search/hotword_service_factory.h
@@ -28,9 +28,9 @@ class HotwordServiceFactory : public BrowserContextKeyedServiceFactory {
   // Returns true if hotwording is allowed for |context|.
   static bool IsHotwordAllowed(content::BrowserContext* context);
 
-  // Passes control to the individual service to deal with reloading the
-  // hotword extension as necessary.
-  static bool RetryHotwordExtension(Profile* profile);
+  // Returns the current error message for the service for |context|.
+  // A value of 0 indicates no error.
+  static int GetCurrentError(content::BrowserContext* context);
 
  private:
   friend struct DefaultSingletonTraits<HotwordServiceFactory>;