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

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

Issue 10559036: Added URLRequestContext to constructor for URLRequest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Converted new unittest. 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_condit ion_attribute.h" 5 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_condit ion_attribute.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h" 9 #include "chrome/browser/extensions/api/declarative_webrequest/webrequest_consta nts.h"
10 #include "content/public/browser/resource_request_info.h" 10 #include "content/public/browser/resource_request_info.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 std::string error; 60 std::string error;
61 ListValue resource_types; 61 ListValue resource_types;
62 resource_types.Append(Value::CreateStringValue("main_frame")); 62 resource_types.Append(Value::CreateStringValue("main_frame"));
63 63
64 scoped_ptr<WebRequestConditionAttribute> attribute = 64 scoped_ptr<WebRequestConditionAttribute> attribute =
65 WebRequestConditionAttribute::Create( 65 WebRequestConditionAttribute::Create(
66 keys::kResourceTypeKey, &resource_types, &error); 66 keys::kResourceTypeKey, &resource_types, &error);
67 EXPECT_EQ("", error); 67 EXPECT_EQ("", error);
68 ASSERT_TRUE(attribute.get()); 68 ASSERT_TRUE(attribute.get());
69 69
70 TestURLRequest url_request_ok(GURL("http://www.example.com"), NULL); 70 TestURLRequestContext context;
mmenke 2012/06/20 18:33:50 Is there a reason you're using a TestURLRequestCon
shalev 2012/06/20 20:13:12 I'm trying to maintain existing behavior. Previous
mmenke 2012/06/20 20:24:14 Ahh...Good point, missed that. Was looking at the
71 TestURLRequest url_request_ok(GURL("http://www.example.com"), NULL, &context);
71 content::ResourceRequestInfo::AllocateForTesting(&url_request_ok, 72 content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
72 ResourceType::MAIN_FRAME, NULL); 73 ResourceType::MAIN_FRAME, NULL);
73 EXPECT_TRUE(attribute->IsFulfilled(&url_request_ok, ON_BEFORE_REQUEST)); 74 EXPECT_TRUE(attribute->IsFulfilled(&url_request_ok, ON_BEFORE_REQUEST));
74 75
75 TestURLRequest url_request_fail(GURL("http://www.example.com"), NULL); 76 TestURLRequest url_request_fail(
77 GURL("http://www.example.com"), NULL, &context);
76 content::ResourceRequestInfo::AllocateForTesting(&url_request_ok, 78 content::ResourceRequestInfo::AllocateForTesting(&url_request_ok,
77 ResourceType::SUB_FRAME, NULL); 79 ResourceType::SUB_FRAME, NULL);
78 EXPECT_FALSE(attribute->IsFulfilled(&url_request_fail, ON_BEFORE_REQUEST)); 80 EXPECT_FALSE(attribute->IsFulfilled(&url_request_fail, ON_BEFORE_REQUEST));
79 } 81 }
80 82
81 } // namespace extensions 83 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698