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

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

Issue 11369179: Move url_request_test_util into net namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: patch for landing 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_permissions_unittest.cc
diff --git a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
index b96c6f6a7efb8961bf952e1bbbb3e19361e17209..d594c9fda8929ce712dc62d3534ddd39b6b52b4f 100644
--- a/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
+++ b/chrome/browser/extensions/api/web_request/web_request_permissions_unittest.cc
@@ -16,7 +16,7 @@ using content::ResourceRequestInfo;
TEST(ExtensionWebRequestHelpersTest, TestHideRequestForURL) {
MessageLoopForIO message_loop;
- TestURLRequestContext context;
+ net::TestURLRequestContext context;
scoped_refptr<ExtensionInfoMap> extension_info_map(new ExtensionInfoMap);
const char* sensitive_urls[] = {
"http://clients2.google.com",
@@ -36,7 +36,7 @@ TEST(ExtensionWebRequestHelpersTest, TestHideRequestForURL) {
// Check that requests are rejected based on the destination
for (size_t i = 0; i < arraysize(sensitive_urls); ++i) {
GURL sensitive_url(sensitive_urls[i]);
- TestURLRequest request(sensitive_url, NULL, &context);
+ net::TestURLRequest request(sensitive_url, NULL, &context);
EXPECT_TRUE(
WebRequestPermissions::HideRequest(extension_info_map.get(), &request))
<< sensitive_urls[i];
@@ -44,7 +44,7 @@ TEST(ExtensionWebRequestHelpersTest, TestHideRequestForURL) {
// Check that requests are accepted if they don't touch sensitive urls.
for (size_t i = 0; i < arraysize(non_sensitive_urls); ++i) {
GURL non_sensitive_url(non_sensitive_urls[i]);
- TestURLRequest request(non_sensitive_url, NULL, &context);
+ net::TestURLRequest request(non_sensitive_url, NULL, &context);
EXPECT_FALSE(
WebRequestPermissions::HideRequest(extension_info_map.get(), &request))
<< non_sensitive_urls[i];
@@ -54,14 +54,14 @@ TEST(ExtensionWebRequestHelpersTest, TestHideRequestForURL) {
// WebStore.
// Normally this request is not protected:
GURL non_sensitive_url("http://www.google.com/test.js");
- TestURLRequest non_sensitive_request(non_sensitive_url, NULL, &context);
+ net::TestURLRequest non_sensitive_request(non_sensitive_url, NULL, &context);
EXPECT_FALSE(WebRequestPermissions::HideRequest(extension_info_map.get(),
&non_sensitive_request));
// If the origin is labeled by the WebStoreAppId, it becomes protected.
int process_id = 42;
int site_instance_id = 23;
int frame_id = 17;
- TestURLRequest sensitive_request(non_sensitive_url, NULL, &context);
+ net::TestURLRequest sensitive_request(non_sensitive_url, NULL, &context);
ResourceRequestInfo::AllocateForTesting(&sensitive_request,
ResourceType::SCRIPT, NULL, process_id, frame_id);
extension_info_map->RegisterExtensionProcess(extension_misc::kWebStoreAppId,

Powered by Google App Engine
This is Rietveld 408576698