Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: content/public/test/browser_test_base.h

Issue 14304004: Convert a bunch of test_shell_tests to content_browsertests. These are tests that depend on loading… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/test/browser_test_base.h
===================================================================
--- content/public/test/browser_test_base.h (revision 195684)
+++ content/public/test/browser_test_base.h (working copy)
@@ -5,9 +5,10 @@
#ifndef CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
#define CONTENT_PUBLIC_TEST_BROWSER_TEST_BASE_H_
+#include "base/callback.h"
#include "base/compiler_specific.h"
+#include "net/test/test_server.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "net/test/test_server.h"
class CommandLine;
@@ -82,6 +83,11 @@
// server.
void CreateTestServer(const base::FilePath& test_server_base);
+ // When the test is running in --single-process mode, runs the given task on
+ // the in-process renderer thread. A nested message loop is run until it
+ // returns.
+ void PostTaskToInProcessRendererAndWait(const base::Closure& task);
+
private:
void ProxyRunTestOnMainThreadLoop();
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/test/browser_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698