Revert 95534 - Creat BrowsingDataCookieHelper and CannedBrowsingDataCookieHelper for logging cook...

chrome/browser/content_settings/tab_specific_content_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #pragma once
 
-#include <set>
-#include <string>
-
 #include "base/basictypes.h"
 #include "chrome/browser/geolocation/geolocation_settings_state.h"
 #include "chrome/common/content_settings.h"
 #include "chrome/common/content_settings_types.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/dom_storage_common.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
 class CannedBrowsingDataAppCacheHelper;
-class CannedBrowsingDataCookieHelper;
 class CannedBrowsingDataDatabaseHelper;
 class CannedBrowsingDataFileSystemHelper;
 class CannedBrowsingDataIndexedDBHelper;
 class CannedBrowsingDataLocalStorageHelper;
 class CookiesTreeModel;
 class TabContents;
 class Profile;
 struct ContentSettings;
 
 namespace net {
 class CookieList;
+class CookieMonster;
 class CookieOptions;
 }
 
 class TabSpecificContentSettings : public TabContentsObserver,
                                    public NotificationObserver {
  public:
   explicit TabSpecificContentSettings(TabContents* tab);
 
   virtual ~TabSpecificContentSettings();
 
@@ skipping 157 matching lines @@
 
  private:
   class LocalSharedObjectsContainer {
    public:
     explicit LocalSharedObjectsContainer(Profile* profile);
     ~LocalSharedObjectsContainer();
 
     // Empties the container.
     void Reset();
 
+    net::CookieMonster* cookies() const { return cookies_; }
     CannedBrowsingDataAppCacheHelper* appcaches() const {
       return appcaches_;
     }
-    CannedBrowsingDataCookieHelper* cookies() const {
-      return cookies_;
-    }
     CannedBrowsingDataDatabaseHelper* databases() const {
       return databases_;
     }
     CannedBrowsingDataFileSystemHelper* file_systems() const {
       return file_systems_;
     }
     CannedBrowsingDataIndexedDBHelper* indexed_dbs() const {
       return indexed_dbs_;
     }
     CannedBrowsingDataLocalStorageHelper* local_storages() const {
       return local_storages_;
     }
     CannedBrowsingDataLocalStorageHelper* session_storages() const {
       return session_storages_;
     }
 
     CookiesTreeModel* GetCookiesTreeModel();
 
     bool empty() const;
 
    private:
+    DISALLOW_COPY_AND_ASSIGN(LocalSharedObjectsContainer);
+
+    scoped_refptr<net::CookieMonster> cookies_;
     scoped_refptr<CannedBrowsingDataAppCacheHelper> appcaches_;
-    scoped_refptr<CannedBrowsingDataCookieHelper> cookies_;
     scoped_refptr<CannedBrowsingDataDatabaseHelper> databases_;
     scoped_refptr<CannedBrowsingDataFileSystemHelper> file_systems_;
     scoped_refptr<CannedBrowsingDataIndexedDBHelper> indexed_dbs_;
     scoped_refptr<CannedBrowsingDataLocalStorageHelper> local_storages_;
     scoped_refptr<CannedBrowsingDataLocalStorageHelper> session_storages_;
-
-    DISALLOW_COPY_AND_ASSIGN(LocalSharedObjectsContainer);
   };
 
   void AddBlockedResource(ContentSettingsType content_type,
                           const std::string& resource_identifier);
 
   void OnContentAccessed(ContentSettingsType type);
 
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
@@ skipping 25 matching lines @@
 
   // Stores whether the user can load blocked plugins on this page.
   bool load_plugins_link_enabled_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_