chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc - Issue 10831150: Refactor request parameters into RequestData struct. Also make RequestStage singular.

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_condition_attribute_unittest.cc

Issue 10831150: Refactor request parameters into RequestData struct. Also make RequestStage singular. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: ?? Created 8 years, 4 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/browser/extensions/api/declarative_webrequest/webrequest_condition_attribute.cc ('k') | chrome/browser/extensions/api/declarative_webrequest/webrequest_condition_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_condition_attribute_unittest.cc

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

index d30d95b93695d44e06a389668dccd81346ab141b..791ac0693fbea5f90f168d9b13d04d65f9b2a5ca 100644

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

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

@@ -7,6 +7,7 @@

#include "base/message_loop.h"

#include "base/values.h"

#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_constants.h"

+#include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rule.h"

#include "content/public/browser/resource_request_info.h"

#include "net/url_request/url_request_test_util.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -71,13 +72,15 @@ TEST(WebRequestConditionAttributeTest, TestResourceType) {

TestURLRequest url_request_ok(GURL("http://www.example.com"), NULL, &context);

content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,

ResourceType::MAIN_FRAME, NULL, -1, -1);

- EXPECT_TRUE(attribute->IsFulfilled(&url_request_ok, ON_BEFORE_REQUEST));

+ EXPECT_TRUE(attribute->IsFulfilled(

+ WebRequestRule::RequestData(&url_request_ok, ON_BEFORE_REQUEST)));

TestURLRequest url_request_fail(

GURL("http://www.example.com"), NULL, &context);

content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,

ResourceType::SUB_FRAME, NULL, -1, -1);

- EXPECT_FALSE(attribute->IsFulfilled(&url_request_fail, ON_BEFORE_REQUEST));

+ EXPECT_FALSE(attribute->IsFulfilled(

+ WebRequestRule::RequestData(&url_request_fail, ON_BEFORE_REQUEST)));

}

} // namespace extensions