Move CanonicalCookie into separate files

chrome/browser/ui/views/cookie_info_view.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/ui/views/cookie_info_view.h"
 
 #include <algorithm>
 
 #include "base/i18n/time_formatting.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/cookies_tree_model.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
@@ skipping 25 matching lines @@
       expires_value_field_(NULL),
       expires_value_combobox_(NULL),
       expire_view_(NULL),
       editable_expiration_date_(editable_expiration_date),
       delegate_(NULL) {
 }
 
 CookieInfoView::~CookieInfoView() {
 }
 
-void CookieInfoView::SetCookie(
-    const std::string& domain,
-    const net::CookieMonster::CanonicalCookie& cookie) {
+void CookieInfoView::SetCookie(const std::string& domain,
+                               const net::CanonicalCookie& cookie) {
   name_value_field_->SetText(UTF8ToUTF16(cookie.Name()));
   content_value_field_->SetText(UTF8ToUTF16(cookie.Value()));
   domain_value_field_->SetText(UTF8ToUTF16(domain));
   path_value_field_->SetText(UTF8ToUTF16(cookie.Path()));
   created_value_field_->SetText(
       base::TimeFormatFriendlyDateAndTime(cookie.CreationDate()));
 
   string16 expire_text = cookie.IsPersistent() ?
       base::TimeFormatFriendlyDateAndTime(cookie.ExpiryDate()) :
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_EXPIRES_SESSION);
@@ skipping 15 matching lines @@
   send_for_value_field_->SetText(cookie.IsSecure() ?
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_SECURE) :
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_SENDFOR_ANY));
   EnableCookieDisplay(true);
   Layout();
 }
 
 void CookieInfoView::SetCookieString(const GURL& url,
                                      const std::string& cookie_line) {
   net::ParsedCookie pc(cookie_line);
-  net::CookieMonster::CanonicalCookie cookie(url, pc);
+  net::CanonicalCookie cookie(url, pc);
   SetCookie(pc.HasDomain() ? pc.Domain() : url.host(), cookie);
 }
 
 
 void CookieInfoView::ClearCookieDisplay() {
   string16 no_cookie_string =
       l10n_util::GetStringUTF16(IDS_COOKIES_COOKIE_NONESELECTED);
   name_value_field_->SetText(no_cookie_string);
   content_value_field_->SetText(no_cookie_string);
   domain_value_field_->SetText(no_cookie_string);
@@ skipping 166 matching lines @@
   send_for_value_field_->SetBackgroundColor(text_area_background);
   created_value_field_->SetReadOnly(true);
   created_value_field_->RemoveBorder();
   created_value_field_->SetBackgroundColor(text_area_background);
   if (expires_value_field_) {
     expires_value_field_->SetReadOnly(true);
     expires_value_field_->RemoveBorder();
     expires_value_field_->SetBackgroundColor(text_area_background);
   }
 }