Move CanonicalCookie into separate files

chrome/browser/local_data_container.h

 // Copyright (c) 2012 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_LOCAL_DATA_CONTAINER_H_
 #define CHROME_BROWSER_LOCAL_DATA_CONTAINER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data_quota_helper.h"
 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
 #include "net/base/server_bound_cert_store.h"
-#include "net/cookies/cookie_monster.h"
 
 class LocalDataContainer;
 class CookiesTreeModel;
 
+namespace net {
+class CanonicalCookie;
+}
+
 // Friendly typedefs for the multiple types of lists used in the model.
 namespace {
 
 typedef std::map<std::string, LocalDataContainer*> ContainerMap;
-typedef std::list<net::CookieMonster::CanonicalCookie> CookieList;
+typedef std::list<net::CanonicalCookie> CookieList;
 typedef std::list<BrowsingDataDatabaseHelper::DatabaseInfo> DatabaseInfoList;
 typedef std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>
     LocalStorageInfoList;
 typedef std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo>
     SessionStorageInfoList;
 typedef std::list<BrowsingDataIndexedDBHelper::IndexedDBInfo>
     IndexedDBInfoList;
 typedef std::list<BrowsingDataFileSystemHelper::FileSystemInfo>
     FileSystemInfoList;
 typedef std::list<BrowsingDataQuotaHelper::QuotaInfo> QuotaInfoList;
@@ skipping 89 matching lines @@
   // A delegate, which must outlive this object. The update callbacks use the
   // delegate to deliver the updated data to the CookieTreeModel.
   CookiesTreeModel* model_;
 
   base::WeakPtrFactory<LocalDataContainer> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(LocalDataContainer);
 };
 
 #endif  // CHROME_BROWSER_LOCAL_DATA_CONTAINER_H_