Move CanonicalCookie into separate files

chrome/browser/ui/gtk/gtk_chrome_cookie_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/gtk/gtk_chrome_cookie_view.h"
 
 #include "base/i18n/time_formatting.h"
 #include "base/utf_string_conversions.h"
 #include "grit/generated_resources.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/text/bytes_formatting.h"
 
 namespace {
 
 void InitBrowserDetailStyle(GtkWidget* entry, GtkStyle* label_style,
                             GtkStyle* dialog_style) {
   gtk_widget_modify_fg(entry, GTK_STATE_NORMAL,
@@ skipping 437 matching lines @@
 
 void gtk_chrome_cookie_view_clear(GtkChromeCookieView* self) {
   UpdateVisibleDetailedInfo(self, self->cookie_details_table_);
   ClearCookieDetails(self);
 }
 
 // Switches the display to showing the passed in cookie.
 void gtk_chrome_cookie_view_display_cookie(
     GtkChromeCookieView* self,
     const std::string& domain,
-    const net::CookieMonster::CanonicalCookie& cookie) {
+    const net::CanonicalCookie& cookie) {
   UpdateVisibleDetailedInfo(self, self->cookie_details_table_);
 
   gtk_entry_set_text(GTK_ENTRY(self->cookie_name_entry_),
                      cookie.Name().c_str());
   gtk_entry_set_text(GTK_ENTRY(self->cookie_content_entry_),
                      cookie.Value().c_str());
   gtk_entry_set_text(GTK_ENTRY(self->cookie_domain_entry_),
                      domain.c_str());
   gtk_entry_set_text(GTK_ENTRY(self->cookie_path_entry_),
                      cookie.Path().c_str());
@@ skipping 34 matching lines @@
                                IDS_COOKIES_COOKIE_SENDFOR_SECURE :
                                IDS_COOKIES_COOKIE_SENDFOR_ANY).c_str());
   SetCookieDetailsSensitivity(self, TRUE);
 }
 
 void gtk_chrome_cookie_view_display_cookie_string(
     GtkChromeCookieView* self,
     const GURL& url,
     const std::string& cookie_line) {
   net::ParsedCookie pc(cookie_line);
-  net::CookieMonster::CanonicalCookie cookie(url, pc);
+  net::CanonicalCookie cookie(url, pc);
 
   gtk_chrome_cookie_view_display_cookie(
       self,
       pc.HasDomain() ? pc.Domain() : url.host(),
       cookie);
 }
 
 // Switches the display to showing the passed in database.
 void gtk_chrome_cookie_view_display_database(
     GtkChromeCookieView* self,
@@ skipping 122 matching lines @@
   int store_size = gtk_tree_model_iter_n_children(GTK_TREE_MODEL(store), NULL);
   if (store_size == 1)
     return false;
 
   DCHECK_EQ(2, store_size);
 
   int selected = gtk_combo_box_get_active(GTK_COMBO_BOX(
       self->cookie_expires_combobox_));
   return selected == 1;
 }