Move CanonicalCookie into separate files

chrome/browser/browsing_data_cookie_helper_unittest.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/browsing_data_cookie_helper.h"
 
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
+#include "net/cookies/canonical_cookie.h"
 #include "net/cookies/parsed_cookie.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
 namespace {
 
 class BrowsingDataCookieHelperTest : public testing::Test {
  public:
@@ skipping 117 matching lines @@
   scoped_refptr<BrowsingDataCookieHelper> cookie_helper(
       new BrowsingDataCookieHelper(testing_profile_->GetRequestContext()));
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::FetchCallback,
                  base::Unretained(this)));
 
   // Blocks until BrowsingDataCookieHelperTest::FetchCallback is notified.
   MessageLoop::current()->Run();
 
-  net::CookieMonster::CanonicalCookie cookie = cookie_list_[0];
+  net::CanonicalCookie cookie = cookie_list_[0];
   cookie_helper->DeleteCookie(cookie);
 
   cookie_helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::DeleteCallback,
                  base::Unretained(this)));
   MessageLoop::current()->Run();
 }
 
 TEST_F(BrowsingDataCookieHelperTest, CannedUnique) {
   const GURL origin("http://www.google.com");
@@ skipping 29 matching lines @@
 
   ASSERT_TRUE(helper->empty());
   helper->AddChangedCookie(url_google, url_google, "a=1",
                           net::CookieOptions());
   ASSERT_FALSE(helper->empty());
   helper->Reset();
   ASSERT_TRUE(helper->empty());
 
   net::CookieList cookies;
   net::ParsedCookie pc("a=1");
-  scoped_ptr<net::CookieMonster::CanonicalCookie> cookie(
-      new net::CookieMonster::CanonicalCookie(url_google, pc));
+  scoped_ptr<net::CanonicalCookie> cookie(
+      new net::CanonicalCookie(url_google, pc));
   cookies.push_back(*cookie);
 
   helper->AddReadCookies(url_google, url_google, cookies);
   ASSERT_FALSE(helper->empty());
   helper->Reset();
   ASSERT_TRUE(helper->empty());
 }
 
 TEST_F(BrowsingDataCookieHelperTest, CannedDifferentFrames) {
   GURL frame1_url("http://www.google.com");
@@ skipping 11 matching lines @@
                            net::CookieOptions());
   helper->AddChangedCookie(frame2_url, request_url, "c=1",
                            net::CookieOptions());
 
   helper->StartFetching(
       base::Bind(&BrowsingDataCookieHelperTest::CannedDifferentFramesCallback,
                  base::Unretained(this)));
 }
 
 }  // namespace