Move ContentSettingsDetails and Pattern out of HostContentSettingsMap as separate classes.

chrome/browser/cookies_tree_model_unittest.cc

 // Copyright (c) 2010 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/content_settings_details.h"
 #include "chrome/browser/content_settings/host_content_settings_map.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_indexed_db_helper.h"
 #include "chrome/browser/mock_browsing_data_local_storage_helper.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/test/testing_profile.h"
 #include "net/url_request/url_request_context.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 
 namespace {
 
 class StubSettingsObserver : public NotificationObserver {
  public:
   StubSettingsObserver() : counter(0) {
     registrar_.Add(this, NotificationType::CONTENT_SETTINGS_CHANGED,
                    NotificationService::AllSources());
   }
 
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     ++counter;
-    Details<HostContentSettingsMap::ContentSettingsDetails>
-        settings_details(details);
+    Details<ContentSettingsDetails> settings_details(details);
     last_pattern = settings_details.ptr()->pattern();
   }
 
-  HostContentSettingsMap::Pattern last_pattern;
+  ContentSettingsPattern last_pattern;
   int counter;
 
  private:
   NotificationRegistrar registrar_;
 };
 
 class CookiesTreeModelTest : public testing::Test {
  public:
   CookiesTreeModelTest() : ui_thread_(BrowserThread::UI, &message_loop_),
                            io_thread_(BrowserThread::IO, &message_loop_) {
@@ skipping 611 matching lines @@
   }
   DeleteStoredObjects(cookies_model.GetRoot()->GetChild(1));  // Delete "E"
   {
     EXPECT_STREQ("A,B,C,D,F,G,H", GetMonsterCookies(monster).c_str());
     EXPECT_STREQ("F,C,B,A,G,D,H", GetDisplayedCookies(&cookies_model).c_str());
   }
 }
 
 TEST_F(CookiesTreeModelTest, ContentSettings) {
   GURL host("http://example.com/");
-  HostContentSettingsMap::Pattern pattern("[*.]example.com");
+  ContentSettingsPattern pattern("[*.]example.com");
   net::CookieMonster* monster = profile_->GetCookieMonster();
   monster->SetCookie(host, "A=1");
 
   CookiesTreeModel cookies_model(monster,
       new MockBrowsingDataDatabaseHelper(profile_.get()),
       new MockBrowsingDataLocalStorageHelper(profile_.get()),
       new MockBrowsingDataLocalStorageHelper(profile_.get()),
       new MockBrowsingDataAppCacheHelper(profile_.get()),
       new MockBrowsingDataIndexedDBHelper(profile_.get()));
 
@@ skipping 12 matching lines @@
       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->GetContentSetting(
           host, CONTENT_SETTINGS_TYPE_COOKIES, ""));
 }
 
 }  // namespace