Rewrite scoped_ptr<T>(NULL) to use the default ctor in extensions/.

extensions/common/matcher/url_matcher_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/common/matcher/url_matcher.h"
 
 #include "base/strings/string_util.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 431 matching lines @@
   std::set<StringPattern::ID> matching_patterns;
   matching_patterns.insert(m1.string_pattern()->id());
   EXPECT_FALSE(condition_set->IsMatch(matching_patterns, url1));
 
   matching_patterns.insert(m2.string_pattern()->id());
   EXPECT_TRUE(condition_set->IsMatch(matching_patterns, url1));
   EXPECT_FALSE(condition_set->IsMatch(matching_patterns, url2));
 
   // Test scheme filters.
   scoped_refptr<URLMatcherConditionSet> condition_set2(
-      new URLMatcherConditionSet(1, conditions,
-          scoped_ptr<URLMatcherSchemeFilter>(
-              new URLMatcherSchemeFilter("https")),
-          scoped_ptr<URLMatcherPortFilter>(NULL)));
+      new URLMatcherConditionSet(1,
+                                 conditions,
+                                 scoped_ptr<URLMatcherSchemeFilter>(
+                                     new URLMatcherSchemeFilter("https")),
+                                 scoped_ptr<URLMatcherPortFilter>()));
   EXPECT_FALSE(condition_set2->IsMatch(matching_patterns, url1));
   scoped_refptr<URLMatcherConditionSet> condition_set3(
-      new URLMatcherConditionSet(1, conditions,
-          scoped_ptr<URLMatcherSchemeFilter>(
-              new URLMatcherSchemeFilter("http")),
-          scoped_ptr<URLMatcherPortFilter>(NULL)));
+      new URLMatcherConditionSet(1,
+                                 conditions,
+                                 scoped_ptr<URLMatcherSchemeFilter>(
+                                     new URLMatcherSchemeFilter("http")),
+                                 scoped_ptr<URLMatcherPortFilter>()));
   EXPECT_TRUE(condition_set3->IsMatch(matching_patterns, url1));
 
   // Test port filters.
   std::vector<URLMatcherPortFilter::Range> ranges;
   ranges.push_back(URLMatcherPortFilter::CreateRange(80));
   scoped_ptr<URLMatcherPortFilter> filter(new URLMatcherPortFilter(ranges));
   scoped_refptr<URLMatcherConditionSet> condition_set4(
-      new URLMatcherConditionSet(1, conditions,
-          scoped_ptr<URLMatcherSchemeFilter>(NULL), filter.Pass()));
+      new URLMatcherConditionSet(
+          1, conditions, scoped_ptr<URLMatcherSchemeFilter>(), filter.Pass()));
   EXPECT_TRUE(condition_set4->IsMatch(matching_patterns, url1));
   EXPECT_TRUE(condition_set4->IsMatch(matching_patterns, url3));
   EXPECT_FALSE(condition_set4->IsMatch(matching_patterns, url4));
 
   // Test regex patterns.
   matching_patterns.clear();
   URLMatcherCondition r1 = factory.CreateURLMatchesCondition("/fo?oo");
   std::set<URLMatcherCondition> regex_conditions;
   regex_conditions.insert(r1);
   scoped_refptr<URLMatcherConditionSet> condition_set5(
@@ skipping 190 matching lines @@
   conditions.insert(factory->CreateOriginAndPathMatchesCondition("val"));
   const int kConditionSetId = 1;
   URLMatcherConditionSet::Vector insert;
   insert.push_back(make_scoped_refptr(
       new URLMatcherConditionSet(kConditionSetId, conditions)));
   matcher.AddConditionSets(insert);
   EXPECT_EQ(0u, matcher.MatchURL(url).size());
 }
 
 }  // namespace extensions