Split incognito extension content settings in session-only and persistent.

chrome/browser/extensions/extension_content_settings_store_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_content_settings_store.h"
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::Mock;
@@ skipping 58 matching lines @@
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("http://www.youtube.com");
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id, false));
   map.SetExtensionContentSetting(
       ext_id,
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
       CONTENT_SETTING_ALLOW,
-      false);
+      extension_prefs_scope::kRegular);
   Mock::VerifyAndClear(&observer);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             map.GetEffectiveContentSetting(
                 url,
                 url,
                 CONTENT_SETTINGS_TYPE_COOKIES,
                 "",
                 false));
 
   // Register second extension.
   std::string ext_id_2("my_second_extension");
   base::Time time_2 = timer.GetNext();
   map.RegisterExtension(ext_id_2, time_2, true);
   EXPECT_CALL(observer, OnContentSettingChanged(ext_id_2, false));
   map.SetExtensionContentSetting(
       ext_id_2,
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_COOKIES,
       "",
       CONTENT_SETTING_BLOCK,
-      false);
+      extension_prefs_scope::kRegular);
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             map.GetEffectiveContentSetting(
                 url,
                 url,
                 CONTENT_SETTINGS_TYPE_COOKIES,
                 "",
                 false));
 
   // Unregister first extension. This shouldn't change the setting.
@@ skipping 16 matching lines @@
             map.GetEffectiveContentSetting(
                 url,
                 url,
                 CONTENT_SETTINGS_TYPE_COOKIES,
                 "",
                 false));
   Mock::VerifyAndClear(&observer);
 
   EXPECT_CALL(observer, OnDestruction());
 }