Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Unified Diff: chrome/browser/extensions/extension_tts_apitest.cc

Issue 8334018: Move the code in libcros' chromeos_speech_synthesis.cc into Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed ScopedRunnableMethodFactory Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_tts_api_chromeos.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_tts_apitest.cc
diff --git a/chrome/browser/extensions/extension_tts_apitest.cc b/chrome/browser/extensions/extension_tts_apitest.cc
index 71f263447b2d713ae601a8ca23e196e9550257fd..4c5b9355bc0ac29fbb9d730519c30b451ea7ec4a 100644
--- a/chrome/browser/extensions/extension_tts_apitest.cc
+++ b/chrome/browser/extensions/extension_tts_apitest.cc
@@ -17,10 +17,6 @@
#define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
#include "testing/gmock_mutant.h"
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/cros/cros_mock.h"
-#endif
-
using ::testing::AnyNumber;
using ::testing::CreateFunctor;
using ::testing::DoAll;
@@ -305,17 +301,3 @@ IN_PROC_BROWSER_TEST_F(TtsApiTest, EngineWordCallbacks) {
ASSERT_TRUE(RunExtensionTest("tts_engine/engine_word_callbacks")) << message_;
}
-
-#if defined(OS_CHROMEOS)
-// Fails since v8 roll at r96374: http://crbug.com/92482
-IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FAILS_TtsChromeOs) {
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kEnableExperimentalExtensionApis);
-
- chromeos::CrosMock crosMock;
- crosMock.InitMockSpeechSynthesisLibrary();
- crosMock.SetSpeechSynthesisLibraryExpectations();
-
- ASSERT_TRUE(RunExtensionTest("tts/chromeos")) << message_;
-}
-#endif
« no previous file with comments | « chrome/browser/extensions/extension_tts_api_chromeos.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698