Revert of Re-enable ScreenOrientationBrowserTests on Chrome OS

content/browser/screen_orientation/screen_orientation_browsertest.cc

 // Copyright 2014 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.
 
 #include <stdlib.h>
 
 #include "base/command_line.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/render_widget_host.h"
@@ skipping 89 matching lines @@
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationBrowserTest);
 };
 
 // This test doesn't work on MacOS X but the reason is mostly because it is not
 // used Aura. It could be set as !defined(OS_MACOSX) but the rule below will
 // actually support MacOS X if and when it switches to Aura.
 #if defined(USE_AURA) || defined(OS_ANDROID)
+// Flaky on Chrome OS: http://crbug.com/468259
+#if defined(OS_CHROMEOS)
+#define MAYBE_ScreenOrientationChange DISABLED_ScreenOrientationChange
+#else
+#define MAYBE_ScreenOrientationChange ScreenOrientationChange
+#endif
 IN_PROC_BROWSER_TEST_F(ScreenOrientationBrowserTest,
-                       ScreenOrientationChange) {
+                       MAYBE_ScreenOrientationChange) {
   std::string types[] = { "portrait-primary",
                           "portrait-secondary",
                           "landscape-primary",
                           "landscape-secondary" };
   GURL test_url = GetTestUrl("screen_orientation",
                              "screen_orientation_screenorientationchange.html");
 
   TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
@@ skipping 15 matching lines @@
     SendFakeScreenOrientation(angle, types[i]);
 
     TestNavigationObserver navigation_observer(shell()->web_contents());
     navigation_observer.Wait();
     EXPECT_EQ(angle, GetOrientationAngle());
     EXPECT_EQ(types[i], GetOrientationType());
   }
 }
 #endif // defined(USE_AURA) || defined(OS_ANDROID)
 
+// Flaky on Chrome OS: http://crbug.com/468259
+#if defined(OS_CHROMEOS)
+#define MAYBE_WindowOrientationChange DISABLED_WindowOrientationChange
+#else
+#define MAYBE_WindowOrientationChange WindowOrientationChange
+#endif
 IN_PROC_BROWSER_TEST_F(ScreenOrientationBrowserTest,
-                       WindowOrientationChange) {
+                       MAYBE_WindowOrientationChange) {
   GURL test_url = GetTestUrl("screen_orientation",
                              "screen_orientation_windoworientationchange.html");
 
   TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 #if USE_AURA || defined(OS_ANDROID)
   WaitForResizeComplete(shell()->web_contents());
 #endif  // USE_AURA || defined(OS_ANDROID)
 
@@ skipping 94 matching lines @@
   TestNavigationObserver navigation_observer(shell()->web_contents(), 2);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 
   EXPECT_EQ("NotSupportedError",
             shell()->web_contents()->GetLastCommittedURL().ref());
 }
 #endif // defined(OS_ANDROID)
 
 } // namespace content