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

Unified Diff: chrome/test/in_process_browser_test.h

Issue 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h (Closed)
Patch Set: hopefully final Created 10 years, 5 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 | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/in_process_browser_test.h
diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index deaf1600f7900526fe2c88342fcb28b65b7e1fe4..eef6c9461977f875e22b8d1ee5befe9acef4a259 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).
« no previous file with comments | « chrome/test/automation/automation_proxy_uitest.cc ('k') | chrome/test/in_process_browser_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698