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

Side by Side Diff: chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_registry_unittest.cc

Issue 10559036: Added URLRequestContext to constructor for URLRequest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Merged with latest version Created 8 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_rules_ registry.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/linked_ptr.h" 9 #include "base/memory/linked_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 std::vector<linked_ptr<RulesRegistry::Rule> > rules; 206 std::vector<linked_ptr<RulesRegistry::Rule> > rules;
207 rules.push_back(CreateRule1()); 207 rules.push_back(CreateRule1());
208 rules.push_back(CreateRule2()); 208 rules.push_back(CreateRule2());
209 209
210 error = registry->AddRules(kExtensionId, rules); 210 error = registry->AddRules(kExtensionId, rules);
211 EXPECT_EQ("", error); 211 EXPECT_EQ("", error);
212 212
213 std::set<WebRequestRule::GlobalRuleId> matches; 213 std::set<WebRequestRule::GlobalRuleId> matches;
214 214
215 GURL http_url("http://www.example.com"); 215 GURL http_url("http://www.example.com");
216 TestURLRequest http_request(http_url, NULL); 216 TestURLRequestContext context;
217 TestURLRequest http_request(http_url, NULL, &context);
217 matches = registry->GetMatches(&http_request, ON_BEFORE_REQUEST); 218 matches = registry->GetMatches(&http_request, ON_BEFORE_REQUEST);
218 EXPECT_EQ(2u, matches.size()); 219 EXPECT_EQ(2u, matches.size());
219 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId1)) != 220 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId1)) !=
220 matches.end()); 221 matches.end());
221 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId2)) != 222 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId2)) !=
222 matches.end()); 223 matches.end());
223 224
224 GURL foobar_url("http://www.foobar.com"); 225 GURL foobar_url("http://www.foobar.com");
225 TestURLRequest foobar_request(foobar_url, NULL); 226 TestURLRequest foobar_request(foobar_url, NULL, &context);
226 matches = registry->GetMatches(&foobar_request, ON_BEFORE_REQUEST); 227 matches = registry->GetMatches(&foobar_request, ON_BEFORE_REQUEST);
227 EXPECT_EQ(1u, matches.size()); 228 EXPECT_EQ(1u, matches.size());
228 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId2)) != 229 EXPECT_TRUE(matches.find(std::make_pair(kExtensionId, kRuleId2)) !=
229 matches.end()); 230 matches.end());
230 } 231 }
231 232
232 TEST_F(WebRequestRulesRegistryTest, RemoveRulesImpl) { 233 TEST_F(WebRequestRulesRegistryTest, RemoveRulesImpl) {
233 scoped_refptr<WebRequestRulesRegistry> registry( 234 scoped_refptr<WebRequestRulesRegistry> registry(
234 new TestWebRequestRulesRegistry()); 235 new TestWebRequestRulesRegistry());
235 std::string error; 236 std::string error;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 rules_to_add_1[0] = CreateRedirectRule("http://www.foo.com"); 328 rules_to_add_1[0] = CreateRedirectRule("http://www.foo.com");
328 error = registry->AddRules(kExtensionId, rules_to_add_1); 329 error = registry->AddRules(kExtensionId, rules_to_add_1);
329 EXPECT_EQ("", error); 330 EXPECT_EQ("", error);
330 331
331 std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_2(1); 332 std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_2(1);
332 rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com"); 333 rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com");
333 error = registry->AddRules(kExtensionId2, rules_to_add_2); 334 error = registry->AddRules(kExtensionId2, rules_to_add_2);
334 EXPECT_EQ("", error); 335 EXPECT_EQ("", error);
335 336
336 GURL url("http://www.google.com"); 337 GURL url("http://www.google.com");
337 TestURLRequest request(url, NULL); 338 TestURLRequestContext context;
339 TestURLRequest request(url, NULL, &context);
338 std::list<LinkedPtrEventResponseDelta> deltas = 340 std::list<LinkedPtrEventResponseDelta> deltas =
339 registry->CreateDeltas(&request, ON_BEFORE_REQUEST, 341 registry->CreateDeltas(&request, ON_BEFORE_REQUEST,
340 WebRequestRule::OptionalRequestData()); 342 WebRequestRule::OptionalRequestData());
341 343
342 // The second extension is installed later and will win for this reason 344 // The second extension is installed later and will win for this reason
343 // in conflict resolution. 345 // in conflict resolution.
344 ASSERT_EQ(2u, deltas.size()); 346 ASSERT_EQ(2u, deltas.size());
345 deltas.sort(&helpers::InDecreasingExtensionInstallationTimeOrder); 347 deltas.sort(&helpers::InDecreasingExtensionInstallationTimeOrder);
346 348
347 std::list<LinkedPtrEventResponseDelta>::iterator i = deltas.begin(); 349 std::list<LinkedPtrEventResponseDelta>::iterator i = deltas.begin();
(...skipping 26 matching lines...) Expand all
374 rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com"); 376 rules_to_add_2[0] = CreateRedirectRule("http://www.bar.com");
375 error = registry->AddRules(kExtensionId2, rules_to_add_2); 377 error = registry->AddRules(kExtensionId2, rules_to_add_2);
376 EXPECT_EQ("", error); 378 EXPECT_EQ("", error);
377 379
378 std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_3(1); 380 std::vector<linked_ptr<RulesRegistry::Rule> > rules_to_add_3(1);
379 rules_to_add_3[0] = CreateIgnoreRule(); 381 rules_to_add_3[0] = CreateIgnoreRule();
380 error = registry->AddRules(kExtensionId, rules_to_add_3); 382 error = registry->AddRules(kExtensionId, rules_to_add_3);
381 EXPECT_EQ("", error); 383 EXPECT_EQ("", error);
382 384
383 GURL url("http://www.google.com/index.html"); 385 GURL url("http://www.google.com/index.html");
384 TestURLRequest request(url, NULL); 386 TestURLRequestContext context;
387 TestURLRequest request(url, NULL, &context);
385 std::list<LinkedPtrEventResponseDelta> deltas = 388 std::list<LinkedPtrEventResponseDelta> deltas =
386 registry->CreateDeltas(&request, ON_BEFORE_REQUEST, 389 registry->CreateDeltas(&request, ON_BEFORE_REQUEST,
387 WebRequestRule::OptionalRequestData()); 390 WebRequestRule::OptionalRequestData());
388 391
389 // The redirect by the first extension is ignored due to the ignore rule. 392 // The redirect by the first extension is ignored due to the ignore rule.
390 ASSERT_EQ(1u, deltas.size()); 393 ASSERT_EQ(1u, deltas.size());
391 LinkedPtrEventResponseDelta effective_rule = *(deltas.begin()); 394 LinkedPtrEventResponseDelta effective_rule = *(deltas.begin());
392 395
393 EXPECT_EQ(kExtensionId2, effective_rule->extension_id); 396 EXPECT_EQ(kExtensionId2, effective_rule->extension_id);
394 EXPECT_EQ(base::Time() + base::TimeDelta::FromDays(2), 397 EXPECT_EQ(base::Time() + base::TimeDelta::FromDays(2),
395 effective_rule->extension_install_time); 398 effective_rule->extension_install_time);
396 EXPECT_EQ(GURL("http://www.bar.com"), effective_rule->new_url); 399 EXPECT_EQ(GURL("http://www.bar.com"), effective_rule->new_url);
397 } 400 }
398 } // namespace extensions 401 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698