Move CanonicalCookie into separate files

chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm

 // 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 "base/sys_string_conversions.h"
 #include "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h"
 #include "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
 
 namespace {
 
 class CookieDetailsViewControllerTest : public CocoaTest {
 };
 
 static CocoaCookieDetails* CreateTestCookieDetails(BOOL canEditExpiration) {
   GURL url("http://chromium.org");
   std::string cookieLine(
       "PHPSESSID=0123456789abcdef0123456789abcdef; path=/");
   net::ParsedCookie pc(cookieLine);
-  net::CookieMonster::CanonicalCookie cookie(url, pc);
+  net::CanonicalCookie cookie(url, pc);
   CocoaCookieDetails* details = [CocoaCookieDetails alloc];
   [details initWithCookie:&cookie
         canEditExpiration:canEditExpiration];
   return [details autorelease];
 }
 
 static CookiePromptContentDetailsAdapter* CreateCookieTestContent(
     BOOL canEditExpiration) {
   CocoaCookieDetails* details = CreateTestCookieDetails(canEditExpiration);
   return [[[CookiePromptContentDetailsAdapter alloc] initWithDetails:details]
@@ skipping 46 matching lines @@
 
   EXPECT_FALSE([detailsViewController.get() hasExpiration]);
   [detailsViewController.get() setCookieHasExplicitExpiration:adapter.get()];
   EXPECT_TRUE([detailsViewController.get() hasExpiration]);
   [detailsViewController.get()
       setCookieDoesntHaveExplicitExpiration:adapter.get()];
   EXPECT_FALSE([detailsViewController.get() hasExpiration]);
 }
 
 }  // namespace