Use WaitForResizeComplete() instead of waiting for first paint.

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"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_navigation_observer.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "content/shell/common/shell_switches.h"
 #include "third_party/WebKit/public/platform/WebScreenInfo.h"
 #include "ui/compositor/compositor_switches.h"
 
 namespace content {
@@ skipping 84 matching lines @@
 // 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_screenorientationchange.html");
 
-  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
-  );
+  TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
   shell()->LoadURL(test_url);
   navigation_observer.Wait();
+#if USE_AURA
+  WaitForResizeComplete(shell()->web_contents());
+#endif // USE_AURA
 
   int angle = GetOrientationAngle();
 
   for (int i = 0; i < 4; ++i) {
     angle = (angle + 90) % 360;
     SendFakeScreenOrientation(angle, types[i]);
 
     TestNavigationObserver navigation_observer(shell()->web_contents());
     navigation_observer.Wait();
     EXPECT_EQ(angle, GetOrientationAngle());
@@ skipping 19 matching lines @@
     angle = (angle + 90) % 360;
     SendFakeScreenOrientation(angle, "portrait-primary");
 
     TestNavigationObserver navigation_observer(shell()->web_contents(), 1);
     navigation_observer.Wait();
     EXPECT_EQ(angle == 270 ? -90 : angle, GetWindowOrientationAngle());
   }
 }
 
 } // namespace content