Make throughput test wait for page to load before starting.

chrome/test/perf/rendering/throughput_tests.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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/test/trace_event_analyzer.h"
+#include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/test_switches.h"
 #include "chrome/test/base/tracing.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/perf/browser_perf_test.h"
 #include "chrome/test/perf/perf_test.h"
 #include "content/public/common/content_switches.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/gl/gl_switches.h"
 
 namespace {
 
 enum ThroughputTestFlags {
   kNone = 0,
   kInternal = 1 << 0 // Test uses internal test data.
 };
 
-const int kSpinUpTimeMs = 5 * 1000;
+const int kSpinUpTimeMs = 4 * 1000;
 const int kRunTimeMs = 10 * 1000;
 const int kIgnoreSomeFrames = 3;
 
 class ThroughputTest : public BrowserPerfTest {
  public:
   explicit ThroughputTest(bool use_gpu) : use_gpu_(use_gpu) {}
 
   bool IsGpuAvailable() const {
     return CommandLine::ForCurrentProcess()->HasSwitch("enable-gpu");
   }
@@ skipping 70 matching lines @@
       return;
     }
 
     std::string json_events;
     TraceEventVector events_sw, events_gpu;
     scoped_ptr<TraceAnalyzer> analyzer;
 
     LOG(INFO) << gurl.possibly_invalid_spec();
     ui_test_utils::NavigateToURLWithDisposition(
         browser(), gurl, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE);
+    ui_test_utils::WaitForLoadStop(browser()->GetSelectedWebContents());
 
     // Let the test spin up.
     LOG(INFO) << "Spinning up test...\n";
     ASSERT_TRUE(tracing::BeginTracing("test_gpu"));
     Wait(kSpinUpTimeMs);
     ASSERT_TRUE(tracing::EndTracing(&json_events));
 
     // Check if GPU is rendering:
     analyzer.reset(TraceAnalyzer::Create(json_events));
     bool ran_on_gpu = (analyzer->FindEvents(Query::EventName() ==
@@ skipping 82 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestSW, CanvasDemoSW) {
   RunTest("canvas-demo", kInternal);
 }
 
 IN_PROC_BROWSER_TEST_F(ThroughputTestGPU, CanvasDemoGPU) {
   RunTest("canvas-demo", kInternal);
 }
 
 }  // namespace