Move CanonicalCookie into separate files

chrome/browser/browsing_data_cookie_helper.h

 // 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.
 
 #ifndef CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_
 #define CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "net/cookies/cookie_monster.h"
 
 class GURL;
 
 namespace net {
+class CanonicalCookie;
 class URLRequestContextGetter;
 }
 
 // This class fetches cookie information on behalf of a caller
 // on the UI thread.
 // A client of this class need to call StartFetching from the UI thread to
 // initiate the flow, and it'll be notified by the callback in its UI
 // thread at some later point.
 class BrowsingDataCookieHelper
     : public base::RefCountedThreadSafe<BrowsingDataCookieHelper> {
  public:
   explicit BrowsingDataCookieHelper(
       net::URLRequestContextGetter* request_context_getter);
 
   // Starts the fetching process, which will notify its completion via
   // callback.
   // This must be called only in the UI thread.
   virtual void StartFetching(
       const base::Callback<void(const net::CookieList& cookies)>& callback);
 
   // Requests a single cookie to be deleted in the IO thread. This must be
   // called in the UI thread.
-  virtual void DeleteCookie(const net::CookieMonster::CanonicalCookie& cookie);
+  virtual void DeleteCookie(const net::CanonicalCookie& cookie);
 
  protected:
   friend class base::RefCountedThreadSafe<BrowsingDataCookieHelper>;
   virtual ~BrowsingDataCookieHelper();
 
   net::URLRequestContextGetter* request_context_getter() {
     return request_context_getter_;
   }
 
  private:
   // Fetch the cookies. This must be called in the IO thread.
   void FetchCookiesOnIOThread();
 
   // Callback function for get cookie. This must be called in the IO thread.
   void OnFetchComplete(const net::CookieList& cookies);
 
   // Notifies the completion callback. This must be called in the UI thread.
   void NotifyInUIThread(const net::CookieList& cookies);
 
   // Delete a single cookie. This must be called in IO thread.
-  void DeleteCookieOnIOThread(
-      const net::CookieMonster::CanonicalCookie& cookie);
+  void DeleteCookieOnIOThread(const net::CanonicalCookie& cookie);
 
   // Indicates whether or not we're currently fetching information:
   // it's true when StartFetching() is called in the UI thread, and it's reset
   // after we notify the callback in the UI thread.
   // This only mutates on the UI thread.
   bool is_fetching_;
 
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
 
   // This only mutates on the UI thread.
@@ skipping 45 matching lines @@
 
   // Returns the map that contains the cookie lists for all frame urls.
   const OriginCookieListMap& origin_cookie_list_map() {
     return origin_cookie_list_map_;
   }
 
  private:
   // Check if the cookie list contains a cookie with the same name,
   // domain, and path as the newly created cookie. Delete the old cookie
   // if does.
-  bool DeleteMatchingCookie(
-      const net::CookieMonster::CanonicalCookie& add_cookie,
-      net::CookieList* cookie_list);
+  bool DeleteMatchingCookie(const net::CanonicalCookie& add_cookie,
+                            net::CookieList* cookie_list);
 
   virtual ~CannedBrowsingDataCookieHelper();
 
   // Returns the |CookieList| for the given |origin|.
   net::CookieList* GetCookiesFor(const GURL& origin);
 
   // Adds the |cookie| to the cookie list for the given |frame_url|.
-  void AddCookie(
-      const GURL& frame_url,
-      const net::CookieMonster::CanonicalCookie& cookie);
+  void AddCookie(const GURL& frame_url,
+                 const net::CanonicalCookie& cookie);
 
   // Map that contains the cookie lists for all frame origins.
   OriginCookieListMap origin_cookie_list_map_;
 
   DISALLOW_COPY_AND_ASSIGN(CannedBrowsingDataCookieHelper);
 };
 
 #endif  // CHROME_BROWSER_BROWSING_DATA_COOKIE_HELPER_H_