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

Side by Side Diff: extensions/browser/extension_pref_value_map_unittest.cc

Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/prefs/pref_store_observer_mock.h" 8 #include "base/prefs/pref_store_observer_mock.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "extensions/browser/extension_pref_value_map.h" 10 #include "extensions/browser/extension_pref_value_map.h"
(...skipping 26 matching lines...) Expand all
37 extensions::kExtensionPrefsScopeRegular; 37 extensions::kExtensionPrefsScopeRegular;
38 static const extensions::ExtensionPrefsScope kRegularOnly = 38 static const extensions::ExtensionPrefsScope kRegularOnly =
39 extensions::kExtensionPrefsScopeRegularOnly; 39 extensions::kExtensionPrefsScopeRegularOnly;
40 static const extensions::ExtensionPrefsScope kIncognitoPersistent = 40 static const extensions::ExtensionPrefsScope kIncognitoPersistent =
41 extensions::kExtensionPrefsScopeIncognitoPersistent; 41 extensions::kExtensionPrefsScopeIncognitoPersistent;
42 static const extensions::ExtensionPrefsScope kIncognitoSessionOnly = 42 static const extensions::ExtensionPrefsScope kIncognitoSessionOnly =
43 extensions::kExtensionPrefsScopeIncognitoSessionOnly; 43 extensions::kExtensionPrefsScopeIncognitoSessionOnly;
44 44
45 // Returns an empty string if the key is not set. 45 // Returns an empty string if the key is not set.
46 std::string GetValue(const char * key, bool incognito) const { 46 std::string GetValue(const char * key, bool incognito) const {
47 const base::Value *value = 47 const base::Value* value =
48 epvm_.GetEffectivePrefValue(key, incognito, NULL); 48 epvm_.GetEffectivePrefValue(key, incognito, nullptr);
49 std::string string_value; 49 std::string string_value;
50 if (value) 50 if (value)
51 value->GetAsString(&string_value); 51 value->GetAsString(&string_value);
52 return string_value; 52 return string_value;
53 } 53 }
54 54
55 // Registers the extension as enabled but without incognito permission. 55 // Registers the extension as enabled but without incognito permission.
56 void RegisterExtension(const std::string& ext_id, 56 void RegisterExtension(const std::string& ext_id,
57 const base::Time& install_time) { 57 const base::Time& install_time) {
58 epvm_.RegisterExtension( 58 epvm_.RegisterExtension(
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 EXPECT_EQ("val3", GetValue(kPref1, false)); 113 EXPECT_EQ("val3", GetValue(kPref1, false));
114 EXPECT_EQ("val5", GetValue(kPref2, false)); 114 EXPECT_EQ("val5", GetValue(kPref2, false));
115 EXPECT_EQ("val8", GetValue(kPref3, false)); 115 EXPECT_EQ("val8", GetValue(kPref3, false));
116 } 116 }
117 117
118 TEST_F(ExtensionPrefValueMapTest, OverrideChecks) { 118 TEST_F(ExtensionPrefValueMapTest, OverrideChecks) {
119 RegisterExtension(kExt1, CreateTime(10)); 119 RegisterExtension(kExt1, CreateTime(10));
120 RegisterExtension(kExt2, CreateTime(20)); 120 RegisterExtension(kExt2, CreateTime(20));
121 RegisterExtension(kExt3, CreateTime(30)); 121 RegisterExtension(kExt3, CreateTime(30));
122 122
123 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, NULL)); 123 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, nullptr));
124 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt2, kPref1, NULL)); 124 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt2, kPref1, nullptr));
125 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, NULL)); 125 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, nullptr));
126 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt1, kPref1, false)); 126 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt1, kPref1, false));
127 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false)); 127 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false));
128 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false)); 128 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false));
129 129
130 epvm_.SetExtensionPref(kExt2, kPref1, kRegular, CreateVal("val1")); 130 epvm_.SetExtensionPref(kExt2, kPref1, kRegular, CreateVal("val1"));
131 131
132 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, NULL)); 132 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, nullptr));
133 EXPECT_TRUE(epvm_.DoesExtensionControlPref(kExt2, kPref1, NULL)); 133 EXPECT_TRUE(epvm_.DoesExtensionControlPref(kExt2, kPref1, nullptr));
134 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, NULL)); 134 EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, nullptr));
135 EXPECT_FALSE(epvm_.CanExtensionControlPref(kExt1, kPref1, false)); 135 EXPECT_FALSE(epvm_.CanExtensionControlPref(kExt1, kPref1, false));
136 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false)); 136 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false));
137 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false)); 137 EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false));
138 } 138 }
139 139
140 TEST_F(ExtensionPrefValueMapTest, SetAndGetPrefValueIncognito) { 140 TEST_F(ExtensionPrefValueMapTest, SetAndGetPrefValueIncognito) {
141 RegisterExtension(kExt1, CreateTime(10)); 141 RegisterExtension(kExt1, CreateTime(10));
142 epvm_.SetExtensionPref(kExt1, kPref1, kRegular, CreateVal("val1")); 142 epvm_.SetExtensionPref(kExt1, kPref1, kRegular, CreateVal("val1"));
143 // Check that the value is not propagated until the extension gets incognito 143 // Check that the value is not propagated until the extension gets incognito
144 // permission. 144 // permission.
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
432 OverrideIncognitoTestCase(false, false, 1, 2, 3, 0, 5, 0, 0, 0, 5, 0), 432 OverrideIncognitoTestCase(false, false, 1, 2, 3, 0, 5, 0, 0, 0, 5, 0),
433 OverrideIncognitoTestCase(false, false, 1, 0, 0, 0, 0, 6, 0, 0, 6, 0), 433 OverrideIncognitoTestCase(false, false, 1, 0, 0, 0, 0, 6, 0, 0, 6, 0),
434 OverrideIncognitoTestCase(false, false, 1, 0, 3, 0, 5, 6, 0, 0, 6, 0), 434 OverrideIncognitoTestCase(false, false, 1, 0, 3, 0, 5, 6, 0, 0, 6, 0),
435 OverrideIncognitoTestCase(false, false, 1, 0, 0, 4, 5, 6, 0, 0, 6, 0), 435 OverrideIncognitoTestCase(false, false, 1, 0, 0, 4, 5, 6, 0, 0, 6, 0),
436 OverrideIncognitoTestCase(false, false, 1, 0, 0, 0, 0, 0, 7, 0, 1, 0), 436 OverrideIncognitoTestCase(false, false, 1, 0, 0, 0, 0, 0, 7, 0, 1, 0),
437 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 7, 0, 5, 0), 437 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 7, 0, 5, 0),
438 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 0, 8, 5, 0), 438 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 0, 8, 5, 0),
439 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 7, 8, 5, 0), 439 OverrideIncognitoTestCase(false, false, 1, 2, 0, 0, 5, 0, 7, 8, 5, 0),
440 OverrideIncognitoTestCase(false, false, 1, 2, 3, 0, 0, 6, 7, 0, 6, 0) 440 OverrideIncognitoTestCase(false, false, 1, 2, 3, 0, 0, 6, 7, 0, 6, 0)
441 )); 441 ));
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698