Split mode incognito extension can get misleading pref changed events from regular mode

chrome/browser/extensions/extension_pref_value_map_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 "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_pref_value_map.h"
 #include "chrome/common/pref_store_observer_mock.h"
@@ skipping 15 matching lines @@
   return Value::CreateStringValue(str);
 }
 
 static base::Time CreateTime(int64 t) {
   return base::Time::FromInternalValue(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 to appease cpplint.py (I didn't
write this code), it was a quick fix so I just included it in this CL. Please
let me know if I should ignore things like this in the future.

[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.
   std::string GetValue(const char * key, bool incognito) const {
     const Value *value = epvm_.GetEffectivePrefValue(key, incognito, NULL);
     std::string string_value = "";
     if (value)
       value->GetAsString(&string_value);
     return string_value;
   }
@@ skipping 52 matching lines @@
   EXPECT_EQ("val3", GetValue(kPref1, false));
   EXPECT_EQ("val5", GetValue(kPref2, false));
   EXPECT_EQ("val8", GetValue(kPref3, false));
 }
 
 TEST_F(ExtensionPrefValueMapTest, OverrideChecks) {
   epvm_.RegisterExtension(kExt1, CreateTime(10), true);
   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));
 }
 
 TEST_F(ExtensionPrefValueMapTest, SetAndGetPrefValueIncognito) {
   epvm_.RegisterExtension(kExt1, CreateTime(10), true);
   epvm_.SetExtensionPref(kExt1, kPref1, kRegular, CreateVal("val1"));
   EXPECT_EQ("val1", GetValue(kPref1, true));
 }
@@ skipping 254 matching lines @@
         OverrideIncognitoTestCase(1, 0, 0, 0,  5, 0, 0, 0,  5, 5),
         OverrideIncognitoTestCase(1, 2, 3, 0,  5, 0, 0, 0,  5, 5),
         OverrideIncognitoTestCase(1, 0, 0, 0,  0, 6, 0, 0,  6, 1),
         OverrideIncognitoTestCase(1, 0, 3, 0,  5, 6, 0, 0,  6, 5),
         OverrideIncognitoTestCase(1, 0, 0, 4,  5, 6, 0, 0,  6, 5),
         OverrideIncognitoTestCase(1, 0, 0, 0,  0, 0, 7, 0,  1, 7),
         OverrideIncognitoTestCase(1, 2, 0, 0,  5, 0, 7, 0,  5, 7),
         OverrideIncognitoTestCase(1, 2, 0, 0,  5, 0, 0, 8,  5, 8),
         OverrideIncognitoTestCase(1, 2, 0, 0,  5, 0, 7, 8,  5, 8),
         OverrideIncognitoTestCase(1, 2, 3, 0,  0, 6, 7, 0,  6, 7)));