Revert "Automatically trigger installation of high-quality speech synthesis extension."

chrome/browser/speech/tts_controller.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_SPEECH_TTS_CONTROLLER_H_
 #define CHROME_BROWSER_SPEECH_TTS_CONTROLLER_H_
 
 #include <queue>
 #include <set>
 #include <string>
@@ skipping 84 matching lines @@
   virtual void OnVoicesChanged() = 0;
 };
 
 // One speech utterance.
 class Utterance {
  public:
   // Construct an utterance given a profile and a completion task to call
   // when the utterance is done speaking. Before speaking this utterance,
   // its other parameters like text, rate, pitch, etc. should all be set.
   explicit Utterance(Profile* profile);
-  virtual ~Utterance();
+  ~Utterance();
 
   // Sends an event to the delegate. If the event type is TTS_EVENT_END
   // or TTS_EVENT_ERROR, deletes the utterance. If |char_index| is -1,
   // uses the last good value.
   void OnTtsEvent(TtsEventType event_type,
                   int char_index,
                   const std::string& error_message);
 
   // Finish an utterance without sending an event to the delegate.
   void Finish();
@@ skipping 66 matching lines @@
   void set_event_delegate(
       base::WeakPtr<UtteranceEventDelegate> event_delegate) {
     event_delegate_ = event_delegate;
   }
 
   // Getters and setters for internal state.
   Profile* profile() const { return profile_; }
   int id() const { return id_; }
   bool finished() const { return finished_; }
 
- protected:
-  void set_finished_for_testing(bool finished) { finished_ = finished; }
-
  private:
   // The profile that initiated this utterance.
   Profile* profile_;
 
   // The extension ID of the extension providing TTS for this utterance, or
   // empty if native TTS is being used.
   std::string extension_id_;
 
   // The unique ID of this utterance, used to associate callback functions
   // with utterances.
@@ skipping 74 matching lines @@
   // any.
   void OnTtsEvent(int utterance_id,
                   TtsEventType event_type,
                   int char_index,
                   const std::string& error_message);
 
   // Return a list of all available voices, including the native voice,
   // if supported, and all voices registered by extensions.
   void GetVoices(Profile* profile, std::vector<VoiceData>* out_voices);
 
+  // Called by TtsExtensionLoaderChromeOs::LoadTtsExtension when it
+  // finishes loading the built-in TTS component extension.
+  void RetrySpeakingQueuedUtterances();
+
   // Called by the extension system or platform implementation when the
   // list of voices may have changed and should be re-queried.
   void VoicesChanged();
 
   // Add a delegate that wants to be notified when the set of voices changes.
   void AddVoicesChangedDelegate(VoicesChangedDelegate* delegate);
 
   // Remove delegate that wants to be notified when the set of voices changes.
   void RemoveVoicesChangedDelegate(VoicesChangedDelegate* delegate);
 
@@ skipping 43 matching lines @@
   std::set<VoicesChangedDelegate*> voices_changed_delegates_;
 
   // A pointer to the platform implementation of text-to-speech, for
   // dependency injection.
   TtsPlatformImpl* platform_impl_;
 
   DISALLOW_COPY_AND_ASSIGN(TtsController);
 };
 
 #endif  // CHROME_BROWSER_SPEECH_TTS_CONTROLLER_H_