summaryrefslogtreecommitdiffstats
path: root/chrome/test/in_process_browser_test.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
commit3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch)
treeaa092101b582f5a9973fc68cce625834a9436c86 /chrome/test/in_process_browser_test.h
parent4ada238a76785ee78396cfb8e5992044c302de1e (diff)
downloadchromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.zip
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.gz
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.bz2
GTTF: Move more test server code from net/url_request/url_request_unittest.h
to net/test/test_server.h No code changes, just a move. TEST=none BUG=49680 Review URL: http://codereview.chromium.org/3034038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/in_process_browser_test.h')
-rw-r--r--chrome/test/in_process_browser_test.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index deaf160..eef6c94 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -7,12 +7,16 @@
#pragma once
#include "base/compiler_specific.h"
-#include "net/url_request/url_request_unittest.h"
+#include "base/ref_counted.h"
+#include "base/scoped_ptr.h"
#include "testing/gtest/include/gtest/gtest.h"
class Browser;
+class CommandLine;
class Profile;
+
namespace net {
+class HTTPTestServer;
class RuleBasedHostResolverProc;
}
@@ -98,7 +102,7 @@ class InProcessBrowserTest : public testing::Test {
void SetInitialTimeoutInMS(int initial_timeout);
// Starts an HTTP server.
- HTTPTestServer* StartHTTPServer() WARN_UNUSED_RESULT;
+ net::HTTPTestServer* StartHTTPServer() WARN_UNUSED_RESULT;
// Creates a browser with a single tab (about:blank), waits for the tab to
// finish loading and shows the browser.
@@ -133,7 +137,7 @@ class InProcessBrowserTest : public testing::Test {
Browser* browser_;
// HTTPServer, created when StartHTTPServer is invoked.
- scoped_refptr<HTTPTestServer> http_server_;
+ scoped_refptr<net::HTTPTestServer> http_server_;
// Whether this test requires the browser windows to be shown (interactive
// tests for example need the windows shown).