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

chrome/browser/cookies_tree_model_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/cookies_tree_model.h"
 
 #include <string>
 
 #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/mock_browsing_data_appcache_helper.h"
 #include "chrome/browser/mock_browsing_data_database_helper.h"
 #include "chrome/browser/mock_browsing_data_file_system_helper.h"
 #include "chrome/browser/mock_browsing_data_indexed_db_helper.h"
 #include "chrome/browser/mock_browsing_data_local_storage_helper.h"
 #include "chrome/test/testing_profile.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_type.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/utf_string_conversions.h"
 
+using ::testing::_;
 
 namespace {
 
 class CookiesTreeModelTest : public testing::Test {
  public:
   CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                            io_thread_(BrowserThread::IO, &message_loop_) {
   }
 
   virtual ~CookiesTreeModelTest() {
@@ skipping 815 matching lines @@
       new MockBrowsingDataLocalStorageHelper(profile_.get()),
       new MockBrowsingDataLocalStorageHelper(profile_.get()),
       new MockBrowsingDataAppCacheHelper(profile_.get()),
       new MockBrowsingDataIndexedDBHelper(profile_.get()),
       new MockBrowsingDataFileSystemHelper(profile_.get()),
       false);
 
   TestingProfile profile;
   HostContentSettingsMap* content_settings =
       profile.GetHostContentSettingsMap();
-  StubSettingsObserver observer;
+  MockSettingsObserver observer;
 
   CookieTreeRootNode* root =
       static_cast<CookieTreeRootNode*>(cookies_model.GetRoot());
   CookieTreeOriginNode* origin = root->GetOrCreateOriginNode(host);
 
   EXPECT_EQ(1, origin->child_count());
   EXPECT_TRUE(origin->CanCreateContentException());
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(content_settings,
+                                       CONTENT_SETTINGS_TYPE_COOKIES, false,
+                                       _, false));
+  EXPECT_CALL(observer,
+              OnContentSettingsChanged(content_settings,
+                                       CONTENT_SETTINGS_TYPE_COOKIES, false,
+                                       pattern, false));
   origin->CreateContentException(
       content_settings, CONTENT_SETTING_SESSION_ONLY);
-
-  EXPECT_EQ(2, observer.counter);
-  EXPECT_EQ(pattern, observer.last_pattern);
   EXPECT_EQ(CONTENT_SETTING_SESSION_ONLY,
       content_settings->GetCookieContentSetting(host, host, true));
 }
 
 }  // namespace