Move the code in libcros' chromeos_speech_synthesis.cc into Chrome

chrome/browser/chromeos/cros/cros_mock.cc

Index: chrome/browser/chromeos/cros/cros_mock.cc
diff --git a/chrome/browser/chromeos/cros/cros_mock.cc b/chrome/browser/chromeos/cros/cros_mock.cc
index f592555439af4b4c56528d07565f49def20d0f55..95ce0eced83e88dc1c014d476a7ff87b3539d109 100644
--- a/chrome/browser/chromeos/cros/cros_mock.cc
+++ b/chrome/browser/chromeos/cros/cros_mock.cc
@@ -12,7 +12,6 @@
 #include "chrome/browser/chromeos/cros/mock_network_library.h"
 #include "chrome/browser/chromeos/cros/mock_power_library.h"
 #include "chrome/browser/chromeos/cros/mock_screen_lock_library.h"
-#include "chrome/browser/chromeos/cros/mock_speech_synthesis_library.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/login/wizard_screen.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -36,8 +35,7 @@ CrosMock::CrosMock()
       mock_cryptohome_library_(NULL),
       mock_network_library_(NULL),
       mock_power_library_(NULL),
-      mock_screen_lock_library_(NULL),
-      mock_speech_synthesis_library_(NULL) {
+      mock_screen_lock_library_(NULL) {
 }
 
 CrosMock::~CrosMock() {
@@ -94,15 +92,6 @@ void CrosMock::InitMockScreenLockLibrary() {
   test_api()->SetScreenLockLibrary(mock_screen_lock_library_, true);
 }
 
-void CrosMock::InitMockSpeechSynthesisLibrary() {
-  InitMockLibraryLoader();
-  if (mock_speech_synthesis_library_)
-    return;
-  mock_speech_synthesis_library_ =
-      new StrictMock<MockSpeechSynthesisLibrary>();
-  test_api()->SetSpeechSynthesisLibrary(mock_speech_synthesis_library_, true);
-}
-
 // Initialization of mocks.
 MockCryptohomeLibrary* CrosMock::mock_cryptohome_library() {
   return mock_cryptohome_library_;
@@ -120,10 +109,6 @@ MockScreenLockLibrary* CrosMock::mock_screen_lock_library() {
   return mock_screen_lock_library_;
 }
 
-MockSpeechSynthesisLibrary* CrosMock::mock_speech_synthesis_library() {
-  return mock_speech_synthesis_library_;
-}
-
 void CrosMock::SetStatusAreaMocksExpectations() {
   SetNetworkLibraryStatusAreaExpectations();
   SetPowerLibraryStatusAreaExpectations();
@@ -275,36 +260,6 @@ void CrosMock::SetPowerLibraryExpectations() {
       .Times(AnyNumber());
 }
 
-void CrosMock::SetSpeechSynthesisLibraryExpectations() {
-  InSequence s;
-  EXPECT_CALL(*mock_speech_synthesis_library_, StopSpeaking())
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, SetSpeakProperties(_))
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, Speak(_))
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, IsSpeaking())
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, StopSpeaking())
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, SetSpeakProperties(_))
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, Speak(_))
-      .WillOnce(Return(true))
-      .RetiresOnSaturation();
-  EXPECT_CALL(*mock_speech_synthesis_library_, IsSpeaking())
-      .WillOnce(Return(true))
-      .WillOnce(Return(true))
-      .WillOnce(Return(false))
-      .RetiresOnSaturation();
-}
-
 void CrosMock::TearDownMocks() {
   // Prevent bogus gMock leak check from firing.
   if (loader_)
@@ -317,8 +272,6 @@ void CrosMock::TearDownMocks() {
     test_api()->SetPowerLibrary(NULL, false);
   if (mock_screen_lock_library_)
     test_api()->SetScreenLockLibrary(NULL, false);
-  if (mock_speech_synthesis_library_)
-    test_api()->SetSpeechSynthesisLibrary(NULL, false);
 }
 
 }  // namespace chromeos