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

chrome/browser/content_settings/host_content_settings_map_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 "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "chrome/browser/content_settings/content_settings_details.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/browser/content_settings/stub_settings_observer.h"
+#include "chrome/browser/content_settings/mock_settings_observer.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_pref_service.h"
 #include "chrome/test/testing_profile.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/static_cookie_policy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using ::testing::_;
+
 namespace {
 
 bool SettingsEqual(const ContentSettings& settings1,
                    const ContentSettings& settings2) {
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     if (settings1.settings[i] != settings2.settings[i])
       return false;
   }
   return true;
 }
@@ skipping 172 matching lines @@
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host3, CONTENT_SETTINGS_TYPE_IMAGES, ""));
 }
 
 TEST_F(HostContentSettingsMapTest, Observer) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
-  StubSettingsObserver observer;
+  MockSettingsObserver observer;
 
   ContentSettingsPattern pattern =
        ContentSettingsPattern::FromString("[*.]example.com");
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(host_content_settings_map,
+                                       CONTENT_SETTINGS_TYPE_IMAGES, false,
+                                       pattern, false));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_ALLOW);
-  EXPECT_EQ(host_content_settings_map, observer.last_notifier);
-  EXPECT_EQ(pattern, observer.last_pattern);
-  EXPECT_FALSE(observer.last_update_all);
-  EXPECT_FALSE(observer.last_update_all_types);
-  EXPECT_EQ(1, observer.counter);
+  ::testing::Mock::VerifyAndClearExpectations(&observer);
 
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(host_content_settings_map,
+                                       CONTENT_SETTINGS_TYPE_IMAGES, false,
+                                       _, true));
   host_content_settings_map->ClearSettingsForOneType(
       CONTENT_SETTINGS_TYPE_IMAGES);
-  EXPECT_EQ(host_content_settings_map, observer.last_notifier);
-  EXPECT_TRUE(observer.last_update_all);
-  EXPECT_FALSE(observer.last_update_all_types);
-  EXPECT_EQ(2, observer.counter);
+  ::testing::Mock::VerifyAndClearExpectations(&observer);
 
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(host_content_settings_map,
+                                       CONTENT_SETTINGS_TYPE_IMAGES, false,
+                                       _, true));
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_IMAGES, CONTENT_SETTING_BLOCK);
-  EXPECT_EQ(host_content_settings_map, observer.last_notifier);
-  EXPECT_TRUE(observer.last_update_all);
-  EXPECT_FALSE(observer.last_update_all_types);
-  EXPECT_EQ(3, observer.counter);
 }
 
 TEST_F(HostContentSettingsMapTest, ObserveDefaultPref) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   PrefService* prefs = profile.GetPrefs();
 
   // Make a copy of the default pref value so we can reset it later.
@@ skipping 810 matching lines @@
                 kAllowedSite, kFirstPartySite, true));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetCookieContentSetting(
                 kAllowedSite, kAllowedSite, false));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetCookieContentSetting(
                 kAllowedSite, kAllowedSite, true));
 }
 
 }  // namespace