Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / extensions / input_method_apitest_chromeos.cc

diff --git a/src/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc b/src/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
index c462fca..5c1ddef 100644 (file)
--- a/src/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
+++ b/src/chrome/browser/chromeos/extensions/input_method_apitest_chromeos.cc
@@ -41,7 +41,7 @@ class TestListener : public content::NotificationObserver {
   // Implements the content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     const std::string& content = *content::Details<std::string>(details).ptr();
     if (content == kBackgroundReady) {
       // Initializes IMF for testing when receives ready message from
@@ -64,7 +64,7 @@ class TestListener : public content::NotificationObserver {
 };
 
 class ExtensionInputMethodApiTest : public ExtensionApiTest {
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         extensions::switches::kWhitelistedExtensionID,
@@ -74,7 +74,14 @@ class ExtensionInputMethodApiTest : public ExtensionApiTest {
 
 }  // namespace
 
-IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, Basic) {
+// Fails on cros official bot. crbug.com/431446.
+#if defined(OFFICIAL_BUILD)
+#define MAYBE_Basic DISABLED_Basic
+#else
+#define MAYBE_Basic Basic
+#endif
+
+IN_PROC_BROWSER_TEST_F(ExtensionInputMethodApiTest, MAYBE_Basic) {
   // Listener for extension's background ready.
   TestListener listener;