Enable Screen Orientation integration tests for Chrome OS and Android.

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 71 matching lines @@
     std::string type;
     ExecuteScriptAndGetValue(shell()->web_contents()->GetMainFrame(),
                              "screen.orientation.type")->GetAsString(&type);
     return type;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ScreenOrientationBrowserTest);
 };
 
-#if !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(ScreenOrientationBrowserTest, OrientationChange) {
+// 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)
+IN_PROC_BROWSER_TEST_F(ScreenOrientationBrowserTest, ScreenOrientationChange) {
   std::string types[] = { "portrait-primary",
                           "portrait-secondary",
                           "landscape-primary",
                           "landscape-secondary" };
   GURL test_url = GetTestUrl("screen_orientation",
                              "screen_orientation_orientationchange.html");
 
-  TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
+  TestNavigationObserver navigation_observer(
+      shell()->web_contents(), 1
+  // Android doesn't paint (ie. UseSoftwareCompositing() has no effect) so we
+  // shouldn't wait for the first paint.
+  #if !defined(OS_ANDROID)
+    , TestNavigationObserver::FirstPaintRequired
+  #endif
+  );
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
 
   int angle = GetOrientationAngle();
 
   for (int i = 0; i < 4; ++i) {
     angle = (angle + 90) % 360;
     SendFakeScreenOrientation(angle, types[i]);
 
-    TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
+    TestNavigationObserver navigation_observer(shell()->web_contents());
     navigation_observer.Wait();
     EXPECT_EQ(angle, GetOrientationAngle());
     EXPECT_EQ(types[i], GetOrientationType());
   }
 }
-#endif // !defined(OS_ANDROID) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
+#endif // defined(USE_AURA) || defined(OS_ANDROID)
 
 } // namespace content