chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc - Issue 11365227: Reland 167337 - Move url_request_test_util into net namespace

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_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

« no previous file with comments | « chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_unittest.cc ('k') | chrome/browser/extensions/api/web_request/web_request_api_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

diff --git a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

index b6c3e2fcd449e3a618df15c462789bcc5026952c..e92ec7412b2813ca6780d164b71ba2297bba9f14 100644

--- a/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

+++ b/chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

@@ -227,8 +227,8 @@ TEST_F(WebRequestRulesRegistryTest, AddRulesImpl) {

std::set<WebRequestRule::GlobalRuleId> matches;

GURL http_url("http://www.example.com");

- TestURLRequestContext context;

- TestURLRequest http_request(http_url, NULL, &context);

+ net::TestURLRequestContext context;

+ net::TestURLRequest http_request(http_url, NULL, &context);

matches = registry->GetMatches(

WebRequestRule::RequestData(&http_request, ON_BEFORE_REQUEST));

EXPECT_EQ(2u, matches.size());

@@ -238,7 +238,7 @@ TEST_F(WebRequestRulesRegistryTest, AddRulesImpl) {

matches.end());

GURL foobar_url("http://www.foobar.com");

- TestURLRequest foobar_request(foobar_url, NULL, &context);

+ net::TestURLRequest foobar_request(foobar_url, NULL, &context);

matches = registry->GetMatches(

WebRequestRule::RequestData(&foobar_request, ON_BEFORE_REQUEST));

EXPECT_EQ(1u, matches.size());

@@ -359,8 +359,8 @@ TEST_F(WebRequestRulesRegistryTest, Precedences) {

EXPECT_EQ("", error);

GURL url("http://www.google.com");

- TestURLRequestContext context;

- TestURLRequest request(url, NULL, &context);

+ net::TestURLRequestContext context;

+ net::TestURLRequest request(url, NULL, &context);

std::list<LinkedPtrEventResponseDelta> deltas =

registry->CreateDeltas(

NULL,

@@ -409,8 +409,8 @@ TEST_F(WebRequestRulesRegistryTest, Priorities) {

EXPECT_EQ("", error);

GURL url("http://www.google.com/index.html");

- TestURLRequestContext context;

- TestURLRequest request(url, NULL, &context);

+ net::TestURLRequestContext context;

+ net::TestURLRequest request(url, NULL, &context);

std::list<LinkedPtrEventResponseDelta> deltas =

registry->CreateDeltas(

NULL,