Move CanonicalCookie into separate files

chrome/browser/cookies_tree_model.cc

 // 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.
 
 #include "chrome/browser/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/memory/linked_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "content/public/common/url_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/registry_controlled_domain.h"
-#include "net/cookies/cookie_monster.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/url_request/url_request_context.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace {
 
 struct NodeTitleComparator {
   bool operator()(const CookieTreeNode* lhs, const CookieTreeNode* rhs) {
     return lhs->GetTitle() < rhs->GetTitle();
@@ skipping 139 matching lines @@
 CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitHost(
     const std::string& app_id,
     const std::string& app_name) {
   Init(TYPE_HOST);
   this->app_name = app_name;
   this->app_id = app_id;
   return *this;
 }
 
 CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitCookie(
-    const net::CookieMonster::CanonicalCookie* cookie) {
+    const net::CanonicalCookie* cookie) {
   Init(TYPE_COOKIE);
   this->cookie = cookie;
   return *this;
 }
 
 CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitDatabase(
     const BrowsingDataDatabaseHelper::DatabaseInfo* database_info) {
   Init(TYPE_DATABASE);
   this->database_info = database_info;
   origin = GURL(database_info->origin);
@@ skipping 70 matching lines @@
   if (parent())
     return parent()->GetModel();
   else
     return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieTreeCookieNode, public:
 
 CookieTreeCookieNode::CookieTreeCookieNode(
-    std::list<net::CookieMonster::CanonicalCookie>::iterator cookie)
+    std::list<net::CanonicalCookie>::iterator cookie)
     : CookieTreeNode(UTF8ToUTF16(cookie->Name())),
       cookie_(cookie) {
 }
 
 CookieTreeCookieNode::~CookieTreeCookieNode() {}
 
 void CookieTreeCookieNode::DeleteStoredObjects() {
   LocalDataContainer* container = GetLocalDataContainerForNode(this);
   CHECK(container);
   container->cookie_helper_->DeleteCookie(*cookie_);
@@ skipping 1029 matching lines @@
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }
 
 LocalDataContainer* CookiesTreeModel::GetLocalDataContainer(
     const std::string& app_id) {
   LocalDataContainer* container = app_data_map_[app_id];
   return container;
 }