Remove EmptyRuleIterators with nullptrs.

chrome/browser/extensions/api/content_settings/content_settings_store_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 "chrome/browser/extensions/api/content_settings/content_settings_store.h"
 
 #include <stdint.h>
 
 #include <memory>
 
@@ skipping 42 matching lines @@
 ContentSetting GetContentSettingFromStore(
     const ContentSettingsStore* store,
     const GURL& primary_url, const GURL& secondary_url,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
     bool incognito) {
   std::unique_ptr<content_settings::RuleIterator> rule_iterator(
       store->GetRuleIterator(content_type, resource_identifier, incognito));
   std::unique_ptr<base::Value> setting(
       content_settings::TestUtils::GetContentSettingValueAndPatterns(
-          rule_iterator.get(), primary_url, secondary_url, NULL, NULL));
+          rule_iterator.get(), primary_url, secondary_url, nullptr, nullptr));
   return content_settings::ValueToContentSetting(setting.get());
 }
 
-void GetSettingsForOneTypeFromStore(
+std::vector<content_settings::Rule> GetSettingsForOneTypeFromStore(
     const ContentSettingsStore* store,
     ContentSettingsType content_type,
     const std::string& resource_identifier,
-    bool incognito,
-    std::vector<content_settings::Rule>* rules) {
-  rules->clear();
+    bool incognito) {
+  std::vector<content_settings::Rule> rules;
   std::unique_ptr<content_settings::RuleIterator> rule_iterator(
       store->GetRuleIterator(content_type, resource_identifier, incognito));
-  while (rule_iterator->HasNext())
-    rules->push_back(rule_iterator->Next());
+  if (rule_iterator) {
+    while (rule_iterator->HasNext())
+      rules.push_back(rule_iterator->Next());
+  }
+  return rules;
 }
 
 }  // namespace
 
 class ContentSettingsStoreTest : public ::testing::Test {
  public:
   ContentSettingsStoreTest() :
       store_(new ContentSettingsStore()) {
   }
 
@@ skipping 99 matching lines @@
                                        url,
                                        url,
                                        CONTENT_SETTINGS_TYPE_COOKIES,
                                        std::string(),
                                        false));
 
   store()->RemoveObserver(&observer);
 }
 
 TEST_F(ContentSettingsStoreTest, GetAllSettings) {
-  bool incognito = false;
-  std::vector<content_settings::Rule> rules;
-  GetSettingsForOneTypeFromStore(
-      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
+  const bool incognito = false;
+  std::vector<content_settings::Rule> rules = GetSettingsForOneTypeFromStore(
+      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito);
   ASSERT_EQ(0u, rules.size());
 
   // Register first extension.
   std::string ext_id("my_extension");
   RegisterExtension(ext_id);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromURL(GURL("http://www.youtube.com"));
   store()->SetExtensionContentSetting(ext_id,
                                       pattern,
                                       pattern,
                                       CONTENT_SETTINGS_TYPE_COOKIES,
                                       std::string(),
                                       CONTENT_SETTING_ALLOW,
                                       kExtensionPrefsScopeRegular);
 
-  GetSettingsForOneTypeFromStore(
-      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
+  rules = GetSettingsForOneTypeFromStore(store(), CONTENT_SETTINGS_TYPE_COOKIES,
+                                         std::string(), incognito);
   ASSERT_EQ(1u, rules.size());
   CheckRule(rules[0], pattern, pattern, CONTENT_SETTING_ALLOW);
 
   // Register second extension.
   std::string ext_id_2("my_second_extension");
   RegisterExtension(ext_id_2);
   ContentSettingsPattern pattern_2 =
       ContentSettingsPattern::FromURL(GURL("http://www.example.com"));
   store()->SetExtensionContentSetting(ext_id_2,
                                       pattern_2,
                                       pattern_2,
                                       CONTENT_SETTINGS_TYPE_COOKIES,
                                       std::string(),
                                       CONTENT_SETTING_BLOCK,
                                       kExtensionPrefsScopeRegular);
 
-  GetSettingsForOneTypeFromStore(
-      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
+  rules = GetSettingsForOneTypeFromStore(store(), CONTENT_SETTINGS_TYPE_COOKIES,
+                                         std::string(), incognito);
   ASSERT_EQ(2u, rules.size());
   // Rules appear in the reverse installation order of the extensions.
   CheckRule(rules[0], pattern_2, pattern_2, CONTENT_SETTING_BLOCK);
   CheckRule(rules[1], pattern, pattern, CONTENT_SETTING_ALLOW);
 
   // Disable first extension.
   store()->SetExtensionState(ext_id, false);
 
-  GetSettingsForOneTypeFromStore(
-      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
+  rules = GetSettingsForOneTypeFromStore(store(), CONTENT_SETTINGS_TYPE_COOKIES,
+                                         std::string(), incognito);
   ASSERT_EQ(1u, rules.size());
   CheckRule(rules[0], pattern_2, pattern_2, CONTENT_SETTING_BLOCK);
 
   // Uninstall second extension.
   store()->UnregisterExtension(ext_id_2);
 
-  GetSettingsForOneTypeFromStore(
-      store(), CONTENT_SETTINGS_TYPE_COOKIES, std::string(), incognito, &rules);
+  rules = GetSettingsForOneTypeFromStore(store(), CONTENT_SETTINGS_TYPE_COOKIES,
+                                         std::string(), incognito);
   ASSERT_EQ(0u, rules.size());
 }
 
 }  // namespace extensions