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

chrome/browser/content_settings/content_settings_policy_provider_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/content_settings/content_settings_policy_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.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/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 "content/browser/browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "googleurl/src/gurl.h"
 
+using ::testing::_;
+
 namespace content_settings {
 
 class PolicyDefaultProviderTest : public TestingBrowserProcessTest {
  public:
   PolicyDefaultProviderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   MessageLoop message_loop_;
@@ skipping 21 matching lines @@
   prefs->RemoveManagedPref(prefs::kManagedDefaultCookiesSetting);
   ASSERT_FALSE(
       provider.DefaultSettingIsManaged(CONTENT_SETTINGS_TYPE_COOKIES));
 }
 
 // When a default-content-setting is set to a managed setting a
 // CONTENT_SETTINGS_CHANGED notification should be fired. The same should happen
 // if the managed setting is removed.
 TEST_F(PolicyDefaultProviderTest, ObserveManagedSettingsChange) {
   TestingProfile profile;
-  StubSettingsObserver observer;
+  MockSettingsObserver observer;
   // Make sure the content settings map exists.
   profile.GetHostContentSettingsMap();
   TestingPrefService* prefs = profile.GetTestingPrefService();
 
   // Set the managed default-content-setting.
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(profile.GetHostContentSettingsMap(),
+                                       CONTENT_SETTINGS_TYPE_DEFAULT, true,
+                                       _, true));
   prefs->SetManagedPref(prefs::kManagedDefaultImagesSetting,
                         Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
-  EXPECT_EQ(profile.GetHostContentSettingsMap(), observer.last_notifier);
-  EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
-  EXPECT_TRUE(observer.last_update_all);
-  EXPECT_TRUE(observer.last_update_all_types);
-  EXPECT_EQ(1, observer.counter);
+  ::testing::Mock::VerifyAndClearExpectations(&observer);
 
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(profile.GetHostContentSettingsMap(),
+                                       CONTENT_SETTINGS_TYPE_DEFAULT, true,
+                                       _, true));
   // Remove the managed default-content-setting.
   prefs->RemoveManagedPref(prefs::kManagedDefaultImagesSetting);
-  EXPECT_EQ(profile.GetHostContentSettingsMap(), observer.last_notifier);
-  EXPECT_EQ(CONTENT_SETTINGS_TYPE_DEFAULT, observer.last_type);
-  EXPECT_TRUE(observer.last_update_all);
-  EXPECT_TRUE(observer.last_update_all_types);
-  EXPECT_EQ(2, observer.counter);
 }
 
 class PolicyProviderTest : public testing::Test {
  public:
   PolicyProviderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
  protected:
   // TODO(markusheintz): Check if it's possible to derive the provider class
@@ skipping 82 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             provider.GetContentSetting(
                 google_url,
                 google_url,
                 CONTENT_SETTINGS_TYPE_PLUGINS,
                 "anotherplugin"));
 }
 
 }  // namespace content_settings