chrome/browser/extensions/extension_pref_value_map_unittest.cc - Issue 10559052: Split mode incognito extension can get misleading pref changed events from regular mode

Unified Diff: chrome/browser/extensions/extension_pref_value_map_unittest.cc

Issue 10559052: Split mode incognito extension can get misleading pref changed events from regular mode (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Added test Created 8 years, 6 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

« no previous file with comments | « chrome/browser/extensions/extension_pref_value_map.cc ('k') | chrome/browser/extensions/extension_preference_helpers.cc » ('j') | chrome/test/data/extensions/api_test/preference/onchange/manifest.json » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/extension_pref_value_map_unittest.cc

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

index a295c9429f8554c037485dd505d9338bab28340d..d457347255a2baf23212d9569ac9cc4f6f8250de 100644

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

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

@@ -33,13 +33,13 @@ static base::Time CreateTime(int64 t) {

template <typename BASECLASS>

class ExtensionPrefValueMapTestBase : public BASECLASS {

public:

- const static ExtensionPrefsScope kRegular =

+ static const ExtensionPrefsScope kRegular =

mitchellwrosen 2012/06/20 18:28:26 These "const static" -> "static const" were made t

Bernhard Bauer 2012/06/20 18:55:36 On the contrary, thanks for the cleanup!

kExtensionPrefsScopeRegular;

- const static ExtensionPrefsScope kRegularOnly =

+ static const ExtensionPrefsScope kRegularOnly =

kExtensionPrefsScopeRegularOnly;

- const static ExtensionPrefsScope kIncognitoPersistent =

+ static const ExtensionPrefsScope kIncognitoPersistent =

kExtensionPrefsScopeIncognitoPersistent;

- const static ExtensionPrefsScope kIncognitoSessionOnly =

+ static const ExtensionPrefsScope kIncognitoSessionOnly =

kExtensionPrefsScopeIncognitoSessionOnly;

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

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

epvm_.RegisterExtension(kExt2, CreateTime(20), true);

epvm_.RegisterExtension(kExt3, CreateTime(30), true);

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

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

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

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

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

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

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, false));

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

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

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

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

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

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

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

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