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

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc

Issue 11365227: Reland 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/declarative_webrequest/webrequest_action_unittest.cc
diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
index 9b33ea21bb2d2c411e4ba7da1ddfc1e140761403..ee15049410c6a5e38137160a7daa01d2500500a7 100644
--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_action_unittest.cc
@@ -123,7 +123,7 @@ TEST(WebRequestActionTest, PerlToRe2Style) {
TEST(WebRequestActionTest, TestPermissions) {
// Necessary for TestURLRequest.
MessageLoop message_loop(MessageLoop::TYPE_IO);
- TestURLRequestContext context;
+ net::TestURLRequestContext context;
std::string error;
bool bad_message = false;
@@ -146,7 +146,7 @@ TEST(WebRequestActionTest, TestPermissions) {
ASSERT_TRUE(action.get());
// Check that redirect works on regular URLs but not on protected URLs.
- TestURLRequest regular_request(GURL("http://test.com"), NULL, &context);
+ net::TestURLRequest regular_request(GURL("http://test.com"), NULL, &context);
std::list<LinkedPtrEventResponseDelta> deltas =
action_set->CreateDeltas(
NULL, "ext1",
@@ -154,8 +154,8 @@ TEST(WebRequestActionTest, TestPermissions) {
false, base::Time());
EXPECT_EQ(1u, deltas.size());
- TestURLRequest protected_request(GURL("http://clients1.google.com"),
- NULL, &context);
+ net::TestURLRequest protected_request(GURL("http://clients1.google.com"),
+ NULL, &context);
deltas = action_set->CreateDeltas(
NULL, "ext1",
WebRequestRule::RequestData(&protected_request, ON_BEFORE_REQUEST),

Powered by Google App Engine
This is Rietveld 408576698