extensions/browser/extension_pref_value_map_unittest.cc - Issue 598173003: Run clang-modernize -use-nullptr over src/extensions/.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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, 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

« extensions/browser/api/bluetooth/bluetooth_apitest.cc ('K') | « extensions/browser/extension_pref_value_map.cc ('k') | extensions/browser/extension_prefs.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/extension_pref_value_map_unittest.cc

diff --git a/extensions/browser/extension_pref_value_map_unittest.cc b/extensions/browser/extension_pref_value_map_unittest.cc

index 400a22fa0d87f97c860760f97b5d40c1e3cc9648..79c046927625b6a933973dfe54344b6f2b3402c7 100644

--- a/extensions/browser/extension_pref_value_map_unittest.cc

+++ b/extensions/browser/extension_pref_value_map_unittest.cc

@@ -44,8 +44,8 @@ class ExtensionPrefValueMapTestBase : public BASECLASS {

// Returns an empty string if the key is not set.

std::string GetValue(const char * key, bool incognito) const {

- const base::Value *value =

- epvm_.GetEffectivePrefValue(key, incognito, NULL);

+ const base::Value* value =

+ epvm_.GetEffectivePrefValue(key, incognito, nullptr);

std::string string_value;

if (value)

value->GetAsString(&string_value);

@@ -120,18 +120,18 @@ TEST_F(ExtensionPrefValueMapTest, OverrideChecks) {

RegisterExtension(kExt2, CreateTime(20));

RegisterExtension(kExt3, CreateTime(30));

- EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, NULL));

- EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt2, kPref1, NULL));

- EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, NULL));

+ EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, nullptr));

+ EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt2, kPref1, nullptr));

+ EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, nullptr));

EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt1, kPref1, false));

EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false));

EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false));

epvm_.SetExtensionPref(kExt2, kPref1, kRegular, CreateVal("val1"));

- EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, NULL));

- EXPECT_TRUE(epvm_.DoesExtensionControlPref(kExt2, kPref1, NULL));

- EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, NULL));

+ EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt1, kPref1, nullptr));

+ EXPECT_TRUE(epvm_.DoesExtensionControlPref(kExt2, kPref1, nullptr));

+ EXPECT_FALSE(epvm_.DoesExtensionControlPref(kExt3, kPref1, nullptr));

EXPECT_FALSE(epvm_.CanExtensionControlPref(kExt1, kPref1, false));

EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt2, kPref1, false));

EXPECT_TRUE(epvm_.CanExtensionControlPref(kExt3, kPref1, false));