Use WaitForResizeComplete() instead of waiting for first paint.

content/public/test/test_navigation_observer.cc

 // Copyright (c) 2012 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 "content/public/test/test_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/stl_util.h"
@@ skipping 28 matching lines @@
   }
 
   virtual void DidStartLoading(RenderViewHost* render_view_host) OVERRIDE {
     parent_->OnDidStartLoading(web_contents());
   }
 
   virtual void DidStopLoading(RenderViewHost* render_view_host) OVERRIDE {
     parent_->OnDidStopLoading(web_contents());
   }
 
-  virtual void DidFirstVisuallyNonEmptyPaint() OVERRIDE {
-    parent_->OnDidFirstVisuallyNonEmptyPaint(web_contents());
-  }
-
   TestNavigationObserver* parent_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWebContentsObserver);
 };
 
 TestNavigationObserver::TestNavigationObserver(
     WebContents* web_contents,
-    int number_of_navigations,
-    FirstPaint first_paint)
-    : navigation_started_(false),
-      navigations_completed_(0),
-      number_of_navigations_(number_of_navigations),
-      first_paint_(first_paint),
-      message_loop_runner_(new MessageLoopRunner),
-      web_contents_created_callback_(
-          base::Bind(
-              &TestNavigationObserver::OnWebContentsCreated,
-              base::Unretained(this))) {
-  if (web_contents)
-    RegisterAsObserver(web_contents);
-}
-
-TestNavigationObserver::TestNavigationObserver(
-    WebContents* web_contents,
     int number_of_navigations)
     : navigation_started_(false),
       navigations_completed_(0),
       number_of_navigations_(number_of_navigations),
-      first_paint_(FirstPaintNotRequired),
       message_loop_runner_(new MessageLoopRunner),
       web_contents_created_callback_(
           base::Bind(
               &TestNavigationObserver::OnWebContentsCreated,
               base::Unretained(this))) {
   if (web_contents)
     RegisterAsObserver(web_contents);
 }
 
 TestNavigationObserver::TestNavigationObserver(
     WebContents* web_contents)
     : navigation_started_(false),
       navigations_completed_(0),
       number_of_navigations_(1),
-      first_paint_(FirstPaintNotRequired),
       message_loop_runner_(new MessageLoopRunner),
       web_contents_created_callback_(
           base::Bind(
               &TestNavigationObserver::OnWebContentsCreated,
               base::Unretained(this))) {
   if (web_contents)
     RegisterAsObserver(web_contents);
 }
 
 TestNavigationObserver::~TestNavigationObserver() {
@@ skipping 47 matching lines @@
 
 void TestNavigationObserver::OnDidStartLoading(WebContents* web_contents) {
   navigation_started_ = true;
 }
 
 void TestNavigationObserver::OnDidStopLoading(WebContents* web_contents) {
   if (!navigation_started_)
     return;
 
   ++navigations_completed_;
-  if ((navigations_completed_ == number_of_navigations_) &&
-      first_paint_ == FirstPaintNotRequired) {
+  if (navigations_completed_ == number_of_navigations_) {
     navigation_started_ = false;
     message_loop_runner_->Quit();
   }
-}
-
-void TestNavigationObserver::OnDidFirstVisuallyNonEmptyPaint(
-    WebContents* web_contents) {
-  if (!navigation_started_)
-    return;
-
-  if ((navigations_completed_ == number_of_navigations_) &&
-      first_paint_ == FirstPaintRequired) {
-    navigation_started_ = false;
-    message_loop_runner_->Quit();
-  }
 }
 
 }  // namespace content