Fix broken TTS fuzzer.

TBR=dmazzoni@chromium.org

Bug: 908942
Change-Id: I46cfb9b916f0d06421dfc159e7aee4e61e818589
Reviewed-on: https://chromium-review.googlesource.com/c/1352266
Commit-Queue: Katie Dektar <katie@chromium.org>
Reviewed-by: Katie Dektar <katie@chromium.org>
Reviewed-by: Dominic Mazzoni <dmazzoni@chromium.org>
Reviewed-by: Abhishek Arya <inferno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611385}

chrome/browser/speech/mock_tts_controller.cc

@@ -3,18 +3,18 @@
 // found in the LICENSE file.
 
 #include "base/memory/singleton.h"
-#include "chrome/browser/speech/tts_controller.h"
+#include "content/public/browser/tts_controller.h"
 
-UtteranceContinuousParameters::UtteranceContinuousParameters()
+content::UtteranceContinuousParameters::UtteranceContinuousParameters()
     : rate(1.0), pitch(1.0), volume(1.0) {}
 
-VoiceData::VoiceData() : remote(false), native(false) {}
+content::VoiceData::VoiceData() : remote(false), native(false) {}
 
-VoiceData::VoiceData(const VoiceData& other) = default;
+content::VoiceData::VoiceData(const VoiceData& other) = default;
 
-VoiceData::~VoiceData() {}
+content::VoiceData::~VoiceData() {}
 
-class MockTtsController : public TtsController {
+class MockTtsController : public content::TtsController {
  public:
   static MockTtsController* GetInstance() {
     return base::Singleton<MockTtsController>::get();
@@ -24,7 +24,7 @@ class MockTtsController : public TtsController {
 
   bool IsSpeaking() override { return false; }
 
-  void SpeakOrEnqueue(Utterance* utterance) override {}
+  void SpeakOrEnqueue(content::Utterance* utterance) override {}
 
   void Stop() override {}
 
@@ -33,29 +33,29 @@ class MockTtsController : public TtsController {
   void Resume() override {}
 
   void OnTtsEvent(int utterance_id,
-                  TtsEventType event_type,
+                  content::TtsEventType event_type,
                   int char_index,
                   const std::string& error_message) override {}
 
   void GetVoices(content::BrowserContext* browser_context,
-                 std::vector<VoiceData>* out_voices) override {}
+                 std::vector<content::VoiceData>* out_voices) override {}
 
   void VoicesChanged() override {}
 
-  void AddVoicesChangedDelegate(VoicesChangedDelegate* delegate) override {}
+  void AddVoicesChangedDelegate(
+      content::VoicesChangedDelegate* delegate) override {}
 
-  void RemoveVoicesChangedDelegate(VoicesChangedDelegate* delegate) override {}
+  void RemoveVoicesChangedDelegate(
+      content::VoicesChangedDelegate* delegate) override {}
 
-  void RemoveUtteranceEventDelegate(UtteranceEventDelegate* delegate) override {
-  }
-
-  void SetTtsEngineDelegate(TtsEngineDelegate* delegate) override {}
+  void RemoveUtteranceEventDelegate(
+      content::UtteranceEventDelegate* delegate) override {}
 
-  TtsEngineDelegate* GetTtsEngineDelegate() override { return nullptr; }
+  void SetTtsEngineDelegate(content::TtsEngineDelegate* delegate) override {}
 
-  void SetPlatformImpl(TtsPlatformImpl* platform_impl) override {}
-
-  int QueueSize() override { return 0; }
+  content::TtsEngineDelegate* GetTtsEngineDelegate() override {
+    return nullptr;
+  }
 
  private:
   friend struct base::DefaultSingletonTraits<MockTtsController>;
@@ -63,6 +63,6 @@ class MockTtsController : public TtsController {
 };
 
 // static
-TtsController* TtsController::GetInstance() {
+content::TtsController* content::TtsController::GetInstance() {
   return MockTtsController::GetInstance();
 }

chrome/browser/speech/tts_platform_fuzzer.cc

@@ -12,8 +12,8 @@ extern "C" int LLVMFuzzerTestOneInput(const unsigned char* data, size_t size) {
   int utterance_id = 0;
   std::string utterance;
   std::string lang;
-  VoiceData voice;
-  UtteranceContinuousParameters params;
+  content::VoiceData voice;
+  content::UtteranceContinuousParameters params;
   params.pitch = 1.0;
   params.rate = 1.0;
   params.volume = 0.1;