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

Unified Diff: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

Issue 11410066: Revert 167337 - Move url_request_test_util into net namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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
Index: chrome/browser/extensions/api/web_request/web_request_api_unittest.cc
===================================================================
--- chrome/browser/extensions/api/web_request/web_request_api_unittest.cc (revision 167354)
+++ chrome/browser/extensions/api/web_request/web_request_api_unittest.cc (working copy)
@@ -164,7 +164,7 @@
event_router_.get(), NULL, NULL, NULL, &profile_,
CookieSettings::Factory::GetForProfile(&profile_), &enable_referrers_,
NULL, NULL, NULL));
- context_.reset(new net::TestURLRequestContext(true));
+ context_.reset(new TestURLRequestContext(true));
context_->set_network_delegate(network_delegate_.get());
context_->Init();
}
@@ -180,13 +180,13 @@
content::TestBrowserThread ui_thread_;
content::TestBrowserThread io_thread_;
TestingProfile profile_;
- net::TestDelegate delegate_;
+ TestDelegate delegate_;
BooleanPrefMember enable_referrers_;
TestIPCSender ipc_sender_;
scoped_refptr<extensions::EventRouterForwarder> event_router_;
scoped_refptr<ExtensionInfoMap> extension_info_map_;
scoped_ptr<ChromeNetworkDelegate> network_delegate_;
- scoped_ptr<net::TestURLRequestContext> context_;
+ scoped_ptr<TestURLRequestContext> context_;
};
// Tests that we handle disagreements among extensions about responses to
@@ -707,7 +707,7 @@
event_router_.get(), NULL, NULL, NULL, &profile_,
CookieSettings::Factory::GetForProfile(&profile_), &enable_referrers_,
NULL, NULL, NULL));
- context_.reset(new net::TestURLRequestContext(true));
+ context_.reset(new TestURLRequestContext(true));
host_resolver_.reset(new net::MockHostResolver());
host_resolver_->rules()->AddSimulatedFailure("doesnotexist");
context_->set_host_resolver(host_resolver_.get());
@@ -719,14 +719,14 @@
content::TestBrowserThread ui_thread_;
content::TestBrowserThread io_thread_;
TestingProfile profile_;
- net::TestDelegate delegate_;
+ TestDelegate delegate_;
BooleanPrefMember enable_referrers_;
TestIPCSender ipc_sender_;
scoped_refptr<extensions::EventRouterForwarder> event_router_;
scoped_refptr<ExtensionInfoMap> extension_info_map_;
scoped_ptr<ChromeNetworkDelegate> network_delegate_;
scoped_ptr<net::MockHostResolver> host_resolver_;
- scoped_ptr<net::TestURLRequestContext> context_;
+ scoped_ptr<TestURLRequestContext> context_;
};
TEST_P(ExtensionWebRequestHeaderModificationTest, TestModifications) {

Powered by Google App Engine
This is Rietveld 408576698