summaryrefslogtreecommitdiffstats
path: root/chrome/test/perf
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:11:28 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-19 06:11:28 +0000
commit78089f0bfcb2e2760db01191ceb0165d9517b154 (patch)
treee371ab6d6bedc40421d351648bfb5e68235d8dff /chrome/test/perf
parent39e12cb553cf861ab0b34b3ccd82baa3dd82be7f (diff)
downloadchromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.zip
chromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.tar.gz
chromium_src-78089f0bfcb2e2760db01191ceb0165d9517b154.tar.bz2
Get content_browsertest working. I've added a simple test for now, and will convert the tests in src/content in future changes.
BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10803026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
-rw-r--r--chrome/test/perf/rendering/throughput_tests.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc
index c488999a..4720ee0 100644
--- a/chrome/test/perf/rendering/throughput_tests.cc
+++ b/chrome/test/perf/rendering/throughput_tests.cc
@@ -28,6 +28,7 @@
#include "chrome/test/perf/perf_test.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/test/gpu/gpu_test_config.h"
#include "googleurl/src/gurl.h"
#include "net/base/mock_host_resolver.h"
@@ -201,7 +202,7 @@ class ThroughputTest : public BrowserPerfTest {
MessageLoop::current()->PostDelayedTask(
FROM_HERE, run_loop.QuitClosure(),
base::TimeDelta::FromMilliseconds(ms));
- ui_test_utils::RunThisRunLoop(&run_loop);
+ content::RunThisRunLoop(&run_loop);
}
// Take snapshot of the current tab, encode it as PNG, and save to a SkBitmap.