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

Unified Diff: chrome/browser/content_settings/content_settings_policy_provider_unittest.cc

Issue 2318223002: Remove EmptyRuleIterators with nullptrs. (Closed)
Patch Set: Fix failing unit test Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
index dfd3cc71c79bd40c23d56499f01c1775dfc1c106..948dd312b77a640ff5d5d6d3fb69b4c55e546ef2 100644
--- a/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_policy_provider_unittest.cc
@@ -41,11 +41,9 @@ TEST_F(PolicyProviderTest, DefaultGeolocationContentSetting) {
profile.GetTestingPrefService();
PolicyProvider provider(prefs);
- Rules rules;
-
std::unique_ptr<RuleIterator> rule_iterator(provider.GetRuleIterator(
CONTENT_SETTINGS_TYPE_GEOLOCATION, std::string(), false));
- EXPECT_FALSE(rule_iterator->HasNext());
+ EXPECT_FALSE(rule_iterator);
// Change the managed value of the default geolocation setting
prefs->SetManagedPref(prefs::kManagedDefaultGeolocationSetting,
@@ -53,6 +51,7 @@ TEST_F(PolicyProviderTest, DefaultGeolocationContentSetting) {
rule_iterator = provider.GetRuleIterator(CONTENT_SETTINGS_TYPE_GEOLOCATION,
std::string(), false);
+ ASSERT_TRUE(rule_iterator);
EXPECT_TRUE(rule_iterator->HasNext());
Rule rule = rule_iterator->Next();
EXPECT_FALSE(rule_iterator->HasNext());

Powered by Google App Engine
This is Rietveld 408576698