| Index: extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| diff --git a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| index e24c3a997856aea6519ed5b3c419e74ad7da3937..c4984470007b83bb28ba05f4320e1574d202d5fb 100644
|
| --- a/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| +++ b/extensions/browser/api/declarative_webrequest/webrequest_condition_attribute_unittest.cc
|
| @@ -98,11 +98,11 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
|
|
|
| net::TestURLRequestContext context;
|
| scoped_ptr<net::URLRequest> url_request_ok(context.CreateRequest(
|
| - GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, NULL));
|
| + GURL("http://www.example.com"), net::DEFAULT_PRIORITY, nullptr, nullptr));
|
| content::ResourceRequestInfo::AllocateForTesting(
|
| url_request_ok.get(),
|
| content::RESOURCE_TYPE_SUB_FRAME,
|
| - NULL,
|
| + nullptr,
|
| -1,
|
| -1,
|
| -1,
|
| @@ -111,11 +111,11 @@ TEST(WebRequestConditionAttributeTest, ResourceType) {
|
| ON_BEFORE_REQUEST)));
|
|
|
| scoped_ptr<net::URLRequest> url_request_fail(context.CreateRequest(
|
| - GURL("http://www.example.com"), net::DEFAULT_PRIORITY, NULL, NULL));
|
| + GURL("http://www.example.com"), net::DEFAULT_PRIORITY, nullptr, nullptr));
|
| content::ResourceRequestInfo::AllocateForTesting(
|
| url_request_fail.get(),
|
| content::RESOURCE_TYPE_MAIN_FRAME,
|
| - NULL,
|
| + nullptr,
|
| -1,
|
| -1,
|
| -1,
|
| @@ -142,7 +142,7 @@ TEST(WebRequestConditionAttributeTest, ContentType) {
|
| context.CreateRequest(test_server.GetURL("/headers.html"),
|
| net::DEFAULT_PRIORITY,
|
| &delegate,
|
| - NULL));
|
| + nullptr));
|
| url_request->Start();
|
| base::MessageLoop::current()->Run();
|
|
|
| @@ -226,7 +226,7 @@ TEST(WebRequestConditionAttributeTest, ThirdParty) {
|
| net::TestURLRequestContext context;
|
| net::TestDelegate delegate;
|
| scoped_ptr<net::URLRequest> url_request(
|
| - context.CreateRequest(url_a, net::DEFAULT_PRIORITY, &delegate, NULL));
|
| + context.CreateRequest(url_a, net::DEFAULT_PRIORITY, &delegate, nullptr));
|
|
|
| for (unsigned int i = 1; i <= kLastActiveStage; i <<= 1) {
|
| if (!(kActiveStages & i))
|
| @@ -310,14 +310,14 @@ TEST(WebRequestConditionAttributeTest, Stages) {
|
| &single_stage_list,
|
| &error));
|
| EXPECT_EQ("", error);
|
| - ASSERT_TRUE(one_stage_attributes.back().get() != NULL);
|
| + ASSERT_TRUE(one_stage_attributes.back().get() != nullptr);
|
| }
|
|
|
| const GURL url_empty;
|
| net::TestURLRequestContext context;
|
| net::TestDelegate delegate;
|
| - scoped_ptr<net::URLRequest> url_request(
|
| - context.CreateRequest(url_empty, net::DEFAULT_PRIORITY, &delegate, NULL));
|
| + scoped_ptr<net::URLRequest> url_request(context.CreateRequest(
|
| + url_empty, net::DEFAULT_PRIORITY, &delegate, nullptr));
|
|
|
| for (size_t i = 0; i < arraysize(active_stages); ++i) {
|
| EXPECT_FALSE(empty_attribute->IsFulfilled(
|
| @@ -371,9 +371,9 @@ scoped_ptr<base::DictionaryValue> GetDictionaryFromArray(
|
| const std::string* name = array[i];
|
| const std::string* value = array[i+1];
|
| if (dictionary->HasKey(*name)) {
|
| - base::Value* entry = NULL;
|
| + base::Value* entry = nullptr;
|
| scoped_ptr<base::Value> entry_owned;
|
| - base::ListValue* list = NULL;
|
| + base::ListValue* list = nullptr;
|
| if (!dictionary->GetWithoutPathExpansion(*name, &entry))
|
| return scoped_ptr<base::DictionaryValue>();
|
| switch (entry->GetType()) {
|
| @@ -445,7 +445,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
| context.CreateRequest(GURL("http://example.com"), // Dummy URL.
|
| net::DEFAULT_PRIORITY,
|
| &delegate,
|
| - NULL));
|
| + nullptr));
|
| url_request->SetExtraRequestHeaderByName(
|
| "Custom-header", "custom/value", true /* overwrite */);
|
| url_request->Start();
|
| @@ -493,7 +493,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
| EXPECT_TRUE(result);
|
|
|
| // Third set of test data, corner case -- empty disjunction.
|
| - GetArrayAsVector(NULL, NULL, 0u, &tests);
|
| + GetArrayAsVector(nullptr, nullptr, 0u, &tests);
|
| // Positive filter, failing (no test to pass).
|
| MatchAndCheck(tests, keys::kRequestHeadersKey, stage, url_request.get(),
|
| &result);
|
| @@ -505,7 +505,7 @@ TEST(WebRequestConditionAttributeTest, RequestHeaders) {
|
|
|
| // Fourth set of test data, corner case -- empty conjunction.
|
| const size_t kEmptyConjunctionSizes[] = { 0u };
|
| - GetArrayAsVector(NULL, kEmptyConjunctionSizes, 1u, &tests);
|
| + GetArrayAsVector(nullptr, kEmptyConjunctionSizes, 1u, &tests);
|
| // Positive filter, passing (trivial test).
|
| MatchAndCheck(tests, keys::kRequestHeadersKey, stage, url_request.get(),
|
| &result);
|
| @@ -535,7 +535,7 @@ TEST(WebRequestConditionAttributeTest, ResponseHeaders) {
|
| context.CreateRequest(test_server.GetURL("/headers.html"),
|
| net::DEFAULT_PRIORITY,
|
| &delegate,
|
| - NULL));
|
| + nullptr));
|
| url_request->Start();
|
| base::MessageLoop::current()->Run();
|
|
|
|
|