diff options
Diffstat (limited to 'chrome/browser')
38 files changed, 173 insertions, 149 deletions
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc index 12057f5..2337993 100644 --- a/chrome/browser/automation/automation_util.cc +++ b/chrome/browser/automation/automation_util.cc @@ -33,6 +33,7 @@ #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" @@ -101,7 +102,7 @@ void SetCookieOnIOThread( void SetCookieWithDetailsOnIOThread( const GURL& url, - const net::CookieMonster::CanonicalCookie& cookie, + const net::CanonicalCookie& cookie, const std::string& original_domain, const scoped_refptr<net::URLRequestContextGetter>& context_getter, base::WaitableEvent* event, @@ -255,7 +256,7 @@ void GetCookiesJSON(AutomationProvider* provider, ListValue* list = new ListValue(); for (size_t i = 0; i < cookie_list.size(); ++i) { - const net::CookieMonster::CanonicalCookie& cookie = cookie_list[i]; + const net::CanonicalCookie& cookie = cookie_list[i]; DictionaryValue* cookie_dict = new DictionaryValue(); cookie_dict->SetString("name", cookie.Name()); cookie_dict->SetString("value", cookie.Value()); @@ -364,8 +365,8 @@ void SetCookieJSON(AutomationProvider* provider, return; } - scoped_ptr<net::CookieMonster::CanonicalCookie> cookie( - net::CookieMonster::CanonicalCookie::Create( + scoped_ptr<net::CanonicalCookie> cookie( + net::CanonicalCookie::Create( GURL(url), name, value, domain, path, mac_key, mac_algorithm, base::Time(), base::Time::FromDoubleT(expiry), secure, http_only)); diff --git a/chrome/browser/browsing_data_cookie_helper.cc b/chrome/browser/browsing_data_cookie_helper.cc index deeb9e2..57a3076 100644 --- a/chrome/browser/browsing_data_cookie_helper.cc +++ b/chrome/browser/browsing_data_cookie_helper.cc @@ -14,6 +14,7 @@ #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" @@ -44,7 +45,7 @@ void BrowsingDataCookieHelper::StartFetching( } void BrowsingDataCookieHelper::DeleteCookie( - const net::CookieMonster::CanonicalCookie& cookie) { + const net::CanonicalCookie& cookie) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); BrowserThread::PostTask( BrowserThread::IO, FROM_HERE, @@ -82,7 +83,7 @@ void BrowsingDataCookieHelper::NotifyInUIThread( } void BrowsingDataCookieHelper::DeleteCookieOnIOThread( - const net::CookieMonster::CanonicalCookie& cookie) { + const net::CanonicalCookie& cookie) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); scoped_refptr<net::CookieMonster> cookie_monster = request_context_getter_->GetURLRequestContext()-> @@ -141,8 +142,8 @@ void CannedBrowsingDataCookieHelper::AddChangedCookie( // This fails to create a canonical cookie, if the normalized cookie domain // form cookie line and the url don't have the same domain+registry, or url // host isn't cookie domain or one of its subdomains. - scoped_ptr<net::CookieMonster::CanonicalCookie> cookie( - net::CookieMonster::CanonicalCookie::Create(url, parsed_cookie)); + scoped_ptr<net::CanonicalCookie> cookie( + net::CanonicalCookie::Create(url, parsed_cookie)); if (cookie.get()) AddCookie(frame_url, *cookie); } @@ -191,7 +192,7 @@ void CannedBrowsingDataCookieHelper::StartFetching( } bool CannedBrowsingDataCookieHelper::DeleteMatchingCookie( - const net::CookieMonster::CanonicalCookie& add_cookie, + const net::CanonicalCookie& add_cookie, net::CookieList* cookie_list) { typedef net::CookieList::iterator cookie_iterator; for (cookie_iterator cookie = cookie_list->begin(); @@ -221,7 +222,7 @@ net::CookieList* CannedBrowsingDataCookieHelper::GetCookiesFor( void CannedBrowsingDataCookieHelper::AddCookie( const GURL& frame_url, - const net::CookieMonster::CanonicalCookie& cookie) { + const net::CanonicalCookie& cookie) { net::CookieList* cookie_list = GetCookiesFor(frame_url.GetOrigin()); DeleteMatchingCookie(cookie, cookie_list); diff --git a/chrome/browser/browsing_data_cookie_helper.h b/chrome/browser/browsing_data_cookie_helper.h index d4edc19..aa87fd0 100644 --- a/chrome/browser/browsing_data_cookie_helper.h +++ b/chrome/browser/browsing_data_cookie_helper.h @@ -16,6 +16,7 @@ class GURL; namespace net { +class CanonicalCookie; class URLRequestContextGetter; } @@ -38,7 +39,7 @@ class BrowsingDataCookieHelper // 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>; @@ -59,8 +60,7 @@ class BrowsingDataCookieHelper 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 @@ -126,9 +126,8 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper { // 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(); @@ -136,9 +135,8 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper { 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_; diff --git a/chrome/browser/browsing_data_cookie_helper_unittest.cc b/chrome/browser/browsing_data_cookie_helper_unittest.cc index 13c3297..a3c5af9 100644 --- a/chrome/browser/browsing_data_cookie_helper_unittest.cc +++ b/chrome/browser/browsing_data_cookie_helper_unittest.cc @@ -10,6 +10,7 @@ #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" @@ -147,7 +148,7 @@ TEST_F(BrowsingDataCookieHelperTest, DeleteCookie) { // 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( @@ -197,8 +198,8 @@ TEST_F(BrowsingDataCookieHelperTest, CannedEmpty) { 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); diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 6cd498b..8245f4b 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -97,7 +97,7 @@ #include "grit/generated_resources.h" #include "grit/ui_resources.h" #include "net/base/ssl_cert_request_info.h" -#include "net/cookies/cookie_monster.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_options.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/content_settings/local_shared_objects_container.cc b/chrome/browser/content_settings/local_shared_objects_container.cc index e5e6f39d..fd47677 100644 --- a/chrome/browser/content_settings/local_shared_objects_container.cc +++ b/chrome/browser/content_settings/local_shared_objects_container.cc @@ -15,6 +15,7 @@ #include "content/public/common/url_constants.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" +#include "net/cookies/canonical_cookie.h" LocalSharedObjectsContainer::LocalSharedObjectsContainer(Profile* profile) : appcaches_(new CannedBrowsingDataAppCacheHelper(profile)), diff --git a/chrome/browser/content_settings/tab_specific_content_settings.cc b/chrome/browser/content_settings/tab_specific_content_settings.cc index 50fa8e1..02d356d 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings.cc @@ -31,6 +31,7 @@ #include "content/public/browser/render_view_host_observer.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" +#include "net/cookies/canonical_cookie.h" #include "webkit/fileapi/file_system_types.h" using content::BrowserThread; diff --git a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc index 1bd27f0..922c06b 100644 --- a/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc +++ b/chrome/browser/content_settings/tab_specific_content_settings_unittest.cc @@ -8,7 +8,8 @@ #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" #include "content/public/test/test_browser_thread.h" -#include "net/cookies/cookie_monster.h" +#include "net/cookies/canonical_cookie.h" +#include "net/cookies/cookie_options.h" #include "net/cookies/parsed_cookie.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gmock/include/gmock/gmock.h" @@ -190,9 +191,8 @@ TEST_F(TabSpecificContentSettingsTest, SiteDataObserver) { blocked_by_policy); net::CookieList cookie_list; net::ParsedCookie parsed_cookie("CookieName=CookieValue"); - scoped_ptr<net::CookieMonster::CanonicalCookie> cookie( - net::CookieMonster::CanonicalCookie::Create(GURL("http://google.com"), - parsed_cookie)); + scoped_ptr<net::CanonicalCookie> cookie( + net::CanonicalCookie::Create(GURL("http://google.com"), parsed_cookie)); cookie_list.push_back(*cookie); content_settings.OnCookiesRead(GURL("http://google.com"), GURL("http://google.com"), diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 6bbef6c..835856d 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -22,7 +22,7 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "net/base/registry_controlled_domain.h" -#include "net/cookies/cookie_monster.h" +#include "net/cookies/canonical_cookie.h" #include "net/url_request/url_request_context.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -182,7 +182,7 @@ CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitHost( } CookieTreeNode::DetailedInfo& CookieTreeNode::DetailedInfo::InitCookie( - const net::CookieMonster::CanonicalCookie* cookie) { + const net::CanonicalCookie* cookie) { Init(TYPE_COOKIE); this->cookie = cookie; return *this; @@ -273,7 +273,7 @@ CookiesTreeModel* CookieTreeNode::GetModel() const { // CookieTreeCookieNode, public: CookieTreeCookieNode::CookieTreeCookieNode( - std::list<net::CookieMonster::CanonicalCookie>::iterator cookie) + std::list<net::CanonicalCookie>::iterator cookie) : CookieTreeNode(UTF8ToUTF16(cookie->Name())), cookie_(cookie) { } diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h index b690bf9..9e8b0c09 100644 --- a/chrome/browser/cookies_tree_model.h +++ b/chrome/browser/cookies_tree_model.h @@ -27,7 +27,6 @@ #include "chrome/common/content_settings.h" #include "chrome/common/extensions/extension_set.h" #include "net/base/server_bound_cert_store.h" -#include "net/cookies/cookie_monster.h" #include "ui/base/models/tree_node_model.h" class BrowsingDataCookieHelper; @@ -54,6 +53,10 @@ class CookieTreeSessionStorageNode; class CookieTreeSessionStoragesNode; class ExtensionSpecialStoragePolicy; +namespace net { +class CanonicalCookie; +} + // CookieTreeNode ------------------------------------------------------------- // The base node type in the Cookies, Databases, and Local Storage options // view, from which all other types are derived. Specialized from TreeNode in @@ -94,8 +97,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> { DetailedInfo& Init(NodeType type); DetailedInfo& InitHost(const std::string& app_id, const std::string& app_name); - DetailedInfo& InitCookie( - const net::CookieMonster::CanonicalCookie* cookie); + DetailedInfo& InitCookie(const net::CanonicalCookie* cookie); DetailedInfo& InitDatabase( const BrowsingDataDatabaseHelper::DatabaseInfo* database_info); DetailedInfo& InitLocalStorage( @@ -119,7 +121,7 @@ class CookieTreeNode : public ui::TreeNode<CookieTreeNode> { std::string app_id; NodeType node_type; GURL origin; - const net::CookieMonster::CanonicalCookie* cookie; + const net::CanonicalCookie* cookie; const BrowsingDataDatabaseHelper::DatabaseInfo* database_info; const BrowsingDataLocalStorageHelper::LocalStorageInfo* local_storage_info; const BrowsingDataLocalStorageHelper::LocalStorageInfo* @@ -252,7 +254,7 @@ class CookieTreeCookieNode : public CookieTreeNode { // The cookie should remain valid at least as long as the // CookieTreeCookieNode is valid. explicit CookieTreeCookieNode( - std::list<net::CookieMonster::CanonicalCookie>::iterator cookie); + std::list<net::CanonicalCookie>::iterator cookie); virtual ~CookieTreeCookieNode(); // CookieTreeNode methods: @@ -262,7 +264,7 @@ class CookieTreeCookieNode : public CookieTreeNode { private: // cookie_ is expected to remain valid as long as the CookieTreeCookieNode is // valid. - std::list<net::CookieMonster::CanonicalCookie>::iterator cookie_; + std::list<net::CanonicalCookie>::iterator cookie_; DISALLOW_COPY_AND_ASSIGN(CookieTreeCookieNode); }; diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc index 58f928e..7584c1a 100644 --- a/chrome/browser/extensions/api/cookies/cookies_api.cc +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc @@ -20,6 +20,7 @@ #include "chrome/common/extensions/extension_error_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.cc b/chrome/browser/extensions/api/cookies/cookies_helpers.cc index 55917d5..5bab1aa 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.cc +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.cc @@ -20,6 +20,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "googleurl/src/gurl.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_util.h" namespace extensions { @@ -51,9 +52,8 @@ const char* GetStoreIdFromProfile(Profile* profile) { kOffTheRecordProfileStoreId : kOriginalProfileStoreId; } -DictionaryValue* CreateCookieValue( - const net::CookieMonster::CanonicalCookie& cookie, - const std::string& store_id) { +DictionaryValue* CreateCookieValue(const net::CanonicalCookie& cookie, + const std::string& store_id) { DictionaryValue* result = new DictionaryValue(); // A cookie is a raw byte sequence. By explicitly parsing it as UTF8, we @@ -103,8 +103,7 @@ void GetCookieListFromStore( } } -GURL GetURLFromCanonicalCookie( - const net::CookieMonster::CanonicalCookie& cookie) { +GURL GetURLFromCanonicalCookie(const net::CanonicalCookie& cookie) { const std::string& domain_key = cookie.Domain(); const std::string scheme = cookie.IsSecure() ? chrome::kHttpsScheme : chrome::kHttpScheme; @@ -149,8 +148,7 @@ MatchFilter::MatchFilter(const DictionaryValue* details) DCHECK(details_); } -bool MatchFilter::MatchesCookie( - const net::CookieMonster::CanonicalCookie& cookie) { +bool MatchFilter::MatchesCookie(const net::CanonicalCookie& cookie) { return MatchesString(keys::kNameKey, cookie.Name()) && MatchesDomain(cookie.Domain()) && MatchesString(keys::kPathKey, cookie.Path()) && diff --git a/chrome/browser/extensions/api/cookies/cookies_helpers.h b/chrome/browser/extensions/api/cookies/cookies_helpers.h index 77d1e5d..39e2087 100644 --- a/chrome/browser/extensions/api/cookies/cookies_helpers.h +++ b/chrome/browser/extensions/api/cookies/cookies_helpers.h @@ -22,6 +22,10 @@ class DictionaryValue; class ListValue; } +namespace net { +class CanonicalCookie; +} + namespace extensions { class Extension; @@ -41,9 +45,8 @@ const char* GetStoreIdFromProfile(Profile* profile); // Constructs a Cookie object as defined by the cookies API. This function // allocates a new DictionaryValue object; the caller is responsible for // freeing it. -base::DictionaryValue* CreateCookieValue( - const net::CookieMonster::CanonicalCookie& cookie, - const std::string& store_id); +base::DictionaryValue* CreateCookieValue(const net::CanonicalCookie& cookie, + const std::string& store_id); // Constructs a CookieStore object as defined by the cookies API. This function // allocates a new DictionaryValue object; the caller is responsible for @@ -62,8 +65,7 @@ void GetCookieListFromStore( // a cookie against the extension's host permissions. The Secure // property of the cookie defines the URL scheme, and the cookie's // domain becomes the URL host. -GURL GetURLFromCanonicalCookie( - const net::CookieMonster::CanonicalCookie& cookie); +GURL GetURLFromCanonicalCookie(const net::CanonicalCookie& cookie); // Looks through all cookies in the given cookie store, and appends to the // match list all the cookies that both match the given URL and cookie details @@ -94,7 +96,7 @@ class MatchFilter { // Returns true if the given cookie matches the properties in the match // filter. - bool MatchesCookie(const net::CookieMonster::CanonicalCookie& cookie); + bool MatchesCookie(const net::CanonicalCookie& cookie); private: // Returns true if the details dictionary contains a string with the given diff --git a/chrome/browser/extensions/api/cookies/cookies_unittest.cc b/chrome/browser/extensions/api/cookies/cookies_unittest.cc index 91c80f7..960fc80 100644 --- a/chrome/browser/extensions/api/cookies/cookies_unittest.cc +++ b/chrome/browser/extensions/api/cookies/cookies_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/browser/extensions/api/cookies/cookies_helpers.h" #include "chrome/test/base/testing_profile.h" #include "googleurl/src/gurl.h" +#include "net/cookies/canonical_cookie.h" namespace extensions { @@ -109,7 +110,7 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { double double_value; Value* value; - net::CookieMonster::CanonicalCookie cookie1( + net::CanonicalCookie cookie1( GURL(), "ABC", "DEF", "www.foobar.com", "/", std::string(), std::string(), base::Time(), base::Time(), base::Time(), @@ -138,7 +139,7 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { EXPECT_TRUE(cookie_value1->GetString(keys::kStoreIdKey, &string_value)); EXPECT_EQ("some cookie store", string_value); - net::CookieMonster::CanonicalCookie cookie2( + net::CanonicalCookie cookie2( GURL(), "ABC", "DEF", ".foobar.com", "/", std::string(), std::string(), base::Time(), base::Time::FromDoubleT(10000), base::Time(), false, false); @@ -164,7 +165,7 @@ TEST_F(ExtensionCookiesTest, ExtensionTypeCreation) { } TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) { - net::CookieMonster::CanonicalCookie cookie1( + net::CanonicalCookie cookie1( GURL(), "ABC", "DEF", "www.foobar.com", "/", std::string(), std::string(), base::Time(), base::Time(), base::Time(), @@ -173,7 +174,7 @@ TEST_F(ExtensionCookiesTest, GetURLFromCanonicalCookie) { cookies_helpers::GetURLFromCanonicalCookie( cookie1).spec()); - net::CookieMonster::CanonicalCookie cookie2( + net::CanonicalCookie cookie2( GURL(), "ABC", "DEF", ".helloworld.com", "/", std::string(), std::string(), base::Time(), base::Time(), base::Time(), @@ -187,7 +188,7 @@ TEST_F(ExtensionCookiesTest, EmptyDictionary) { scoped_ptr<DictionaryValue> details(new DictionaryValue()); cookies_helpers::MatchFilter filter(details.get()); std::string domain; - net::CookieMonster::CanonicalCookie cookie; + net::CanonicalCookie cookie; EXPECT_TRUE(filter.MatchesCookie(cookie)); } @@ -207,21 +208,17 @@ TEST_F(ExtensionCookiesTest, DomainMatching) { for (size_t i = 0; i < arraysize(tests); ++i) { details->SetString(keys::kDomainKey, std::string(tests[i].filter)); cookies_helpers::MatchFilter filter(details.get()); - net::CookieMonster::CanonicalCookie cookie(GURL(), "", "", tests[i].domain, - "", "", "", base::Time(), - base::Time(), base::Time(), - false, false); + net::CanonicalCookie cookie(GURL(), "", "", tests[i].domain, "", "", "", + base::Time(), base::Time(), base::Time(), false, + false); EXPECT_EQ(tests[i].matches, filter.MatchesCookie(cookie)); } } TEST_F(ExtensionCookiesTest, DecodeUTF8WithErrorHandling) { - net::CookieMonster::CanonicalCookie cookie(GURL(), "", - "011Q255bNX_1!yd\203e+", - "test.com", - "/path\203", "", "", base::Time(), - base::Time(), base::Time(), - false, false); + net::CanonicalCookie cookie(GURL(), "", "011Q255bNX_1!yd\203e+", "test.com", + "/path\203", "", "", base::Time(), base::Time(), + base::Time(), false, false); scoped_ptr<DictionaryValue> cookie_value( cookies_helpers::CreateCookieValue( cookie, "some cookie store")); diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 282a2ce..71e4ba1 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -75,6 +75,7 @@ #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_options.h" #include "net/url_request/url_request_context.h" diff --git a/chrome/browser/local_data_container.cc b/chrome/browser/local_data_container.cc index ef62a22..89d749c 100644 --- a/chrome/browser/local_data_container.cc +++ b/chrome/browser/local_data_container.cc @@ -10,6 +10,7 @@ #include "chrome/browser/browsing_data_server_bound_cert_helper.h" #include "chrome/browser/content_settings/cookie_settings.h" #include "chrome/browser/cookies_tree_model.h" +#include "net/cookies/canonical_cookie.h" /////////////////////////////////////////////////////////////////////////////// // LocalDataContainer, public: diff --git a/chrome/browser/local_data_container.h b/chrome/browser/local_data_container.h index b595b22..6e71190 100644 --- a/chrome/browser/local_data_container.h +++ b/chrome/browser/local_data_container.h @@ -17,16 +17,19 @@ #include "chrome/browser/browsing_data_quota_helper.h" #include "chrome/browser/browsing_data_server_bound_cert_helper.h" #include "net/base/server_bound_cert_store.h" -#include "net/cookies/cookie_monster.h" class LocalDataContainer; class CookiesTreeModel; +namespace net { +class CanonicalCookie; +} + // Friendly typedefs for the multiple types of lists used in the model. namespace { typedef std::map<std::string, LocalDataContainer*> ContainerMap; -typedef std::list<net::CookieMonster::CanonicalCookie> CookieList; +typedef std::list<net::CanonicalCookie> CookieList; typedef std::list<BrowsingDataDatabaseHelper::DatabaseInfo> DatabaseInfoList; typedef std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> LocalStorageInfoList; diff --git a/chrome/browser/mock_browsing_data_cookie_helper.cc b/chrome/browser/mock_browsing_data_cookie_helper.cc index 7bf77da..4d7085f 100644 --- a/chrome/browser/mock_browsing_data_cookie_helper.cc +++ b/chrome/browser/mock_browsing_data_cookie_helper.cc @@ -5,6 +5,7 @@ #include "chrome/browser/mock_browsing_data_cookie_helper.h" #include "base/logging.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" MockBrowsingDataCookieHelper::MockBrowsingDataCookieHelper( @@ -21,7 +22,7 @@ void MockBrowsingDataCookieHelper::StartFetching( } void MockBrowsingDataCookieHelper::DeleteCookie( - const net::CookieMonster::CanonicalCookie& cookie) { + const net::CanonicalCookie& cookie) { std::string key = cookie.Name() + "=" + cookie.Value(); CHECK(cookies_.find(key) != cookies_.end()); cookies_[key] = false; @@ -31,8 +32,7 @@ void MockBrowsingDataCookieHelper::AddCookieSamples( const GURL& url, const std::string& cookie_line) { typedef net::CookieList::const_iterator cookie_iterator; net::ParsedCookie pc(cookie_line); - scoped_ptr<net::CookieMonster::CanonicalCookie> cc; - cc.reset(new net::CookieMonster::CanonicalCookie(url, pc)); + scoped_ptr<net::CanonicalCookie> cc(new net::CanonicalCookie(url, pc)); if (cc.get()) { for (cookie_iterator cookie = cookie_list_.begin(); diff --git a/chrome/browser/mock_browsing_data_cookie_helper.h b/chrome/browser/mock_browsing_data_cookie_helper.h index f1e0e22..dc10238 100644 --- a/chrome/browser/mock_browsing_data_cookie_helper.h +++ b/chrome/browser/mock_browsing_data_cookie_helper.h @@ -9,6 +9,7 @@ #include <string> #include "chrome/browser/browsing_data_cookie_helper.h" +#include "net/cookies/canonical_cookie.h" // Mock for BrowsingDataCookieHelper. class MockBrowsingDataCookieHelper : public BrowsingDataCookieHelper { @@ -19,8 +20,7 @@ class MockBrowsingDataCookieHelper : public BrowsingDataCookieHelper { // BrowsingDataCookieHelper methods. virtual void StartFetching( const net::CookieMonster::GetCookieListCallback &callback) OVERRIDE; - virtual void DeleteCookie( - const net::CookieMonster::CanonicalCookie& cookie) OVERRIDE; + virtual void DeleteCookie(const net::CanonicalCookie& cookie) OVERRIDE; // Adds some cookie samples. void AddCookieSamples(const GURL& url, const std::string& cookie_line); diff --git a/chrome/browser/net/chrome_cookie_notification_details.h b/chrome/browser/net/chrome_cookie_notification_details.h index 4b1229f..d54f280 100644 --- a/chrome/browser/net/chrome_cookie_notification_details.h +++ b/chrome/browser/net/chrome_cookie_notification_details.h @@ -7,9 +7,13 @@ #include "net/cookies/cookie_monster.h" +namespace net { +class CanonicalCookie; +} + struct ChromeCookieDetails { public: - ChromeCookieDetails(const net::CookieMonster::CanonicalCookie* cookie_copy, + ChromeCookieDetails(const net::CanonicalCookie* cookie_copy, bool is_removed, net::CookieMonster::Delegate::ChangeCause cause) : cookie(cookie_copy), @@ -17,7 +21,7 @@ struct ChromeCookieDetails { cause(cause) { } - const net::CookieMonster::CanonicalCookie* cookie; + const net::CanonicalCookie* cookie; bool removed; net::CookieMonster::Delegate::ChangeCause cause; }; diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc index cc87909..a75ede4 100644 --- a/chrome/browser/net/chrome_network_delegate.cc +++ b/chrome/browser/net/chrome_network_delegate.cc @@ -25,7 +25,8 @@ #include "net/base/host_port_pair.h" #include "net/base/net_errors.h" #include "net/base/net_log.h" -#include "net/cookies/cookie_monster.h" +#include "net/cookies/canonical_cookie.h" +#include "net/cookies/cookie_options.h" #include "net/http/http_request_headers.h" #include "net/http/http_response_headers.h" #include "net/socket_stream/socket_stream.h" diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc index 8a6e367..9fc891b 100644 --- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc @@ -87,9 +87,9 @@ TEST(GaiaOAuthFetcherTest, GetOAuthToken) { base::Time creation = base::Time::Now(); base::Time expiration = base::Time::Time(); - scoped_ptr<net::CookieMonster::CanonicalCookie> canonical_cookie; + scoped_ptr<net::CanonicalCookie> canonical_cookie; canonical_cookie.reset( - new net::CookieMonster::CanonicalCookie( + new net::CanonicalCookie( GURL("http://www.google.com/"), // url "oauth_token", // name oauth_token, // value diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.cc b/chrome/browser/net/sqlite_persistent_cookie_store.cc index 1d7f241..86a7702 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store.cc @@ -28,6 +28,7 @@ #include "content/public/browser/browser_thread.h" #include "googleurl/src/gurl.h" #include "net/base/registry_controlled_domain.h" +#include "net/cookies/canonical_cookie.h" #include "sql/meta_table.h" #include "sql/statement.h" #include "sql/transaction.h" @@ -83,13 +84,13 @@ class SQLitePersistentCookieStore::Backend const LoadedCallback& loaded_callback); // Batch a cookie addition. - void AddCookie(const net::CookieMonster::CanonicalCookie& cc); + void AddCookie(const net::CanonicalCookie& cc); // Batch a cookie access time update. - void UpdateCookieAccessTime(const net::CookieMonster::CanonicalCookie& cc); + void UpdateCookieAccessTime(const net::CanonicalCookie& cc); // Batch a cookie deletion. - void DeleteCookie(const net::CookieMonster::CanonicalCookie& cc); + void DeleteCookie(const net::CanonicalCookie& cc); // Commit pending operations as soon as possible. void Flush(const base::Closure& callback); @@ -120,16 +121,15 @@ class SQLitePersistentCookieStore::Backend COOKIE_DELETE, } OperationType; - PendingOperation(OperationType op, - const net::CookieMonster::CanonicalCookie& cc) + PendingOperation(OperationType op, const net::CanonicalCookie& cc) : op_(op), cc_(cc) { } OperationType op() const { return op_; } - const net::CookieMonster::CanonicalCookie& cc() const { return cc_; } + const net::CanonicalCookie& cc() const { return cc_; } private: OperationType op_; - net::CookieMonster::CanonicalCookie cc_; + net::CanonicalCookie cc_; }; private: @@ -179,7 +179,7 @@ class SQLitePersistentCookieStore::Backend // Batch a cookie operation (add or delete) void BatchOperation(PendingOperation::OperationType op, - const net::CookieMonster::CanonicalCookie& cc); + const net::CanonicalCookie& cc); // Commit our pending operations to the database. void Commit(); // Close() executed on the background thread. @@ -204,7 +204,7 @@ class SQLitePersistentCookieStore::Backend // Temporary buffer for cookies loaded from DB. Accumulates cookies to reduce // the number of messages sent to the IO thread. Sent back in response to // individual load requests for domain keys or when all loading completes. - std::vector<net::CookieMonster::CanonicalCookie*> cookies_; + std::vector<net::CanonicalCookie*> cookies_; // Map of domain keys(eTLD+1) to domains/hosts that are to be loaded from DB. std::map<std::string, std::set<std::string> > keys_to_load_; @@ -462,7 +462,7 @@ void SQLitePersistentCookieStore::Backend::Notify( bool load_success) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); - std::vector<net::CookieMonster::CanonicalCookie*> cookies; + std::vector<net::CanonicalCookie*> cookies; { base::AutoLock locked(lock_); cookies.swap(cookies_); @@ -608,13 +608,13 @@ bool SQLitePersistentCookieStore::Backend::LoadCookiesForDomains( return false; } - std::vector<net::CookieMonster::CanonicalCookie*> cookies; + std::vector<net::CanonicalCookie*> cookies; std::set<std::string>::const_iterator it = domains.begin(); for (; it != domains.end(); ++it) { smt.BindString(0, *it); while (smt.Step()) { - scoped_ptr<net::CookieMonster::CanonicalCookie> cc( - new net::CookieMonster::CanonicalCookie( + scoped_ptr<net::CanonicalCookie> cc( + new net::CanonicalCookie( // The "source" URL is not used with persisted cookies. GURL(), // Source smt.ColumnString(2), // name @@ -751,23 +751,23 @@ bool SQLitePersistentCookieStore::Backend::EnsureDatabaseVersion() { } void SQLitePersistentCookieStore::Backend::AddCookie( - const net::CookieMonster::CanonicalCookie& cc) { + const net::CanonicalCookie& cc) { BatchOperation(PendingOperation::COOKIE_ADD, cc); } void SQLitePersistentCookieStore::Backend::UpdateCookieAccessTime( - const net::CookieMonster::CanonicalCookie& cc) { + const net::CanonicalCookie& cc) { BatchOperation(PendingOperation::COOKIE_UPDATEACCESS, cc); } void SQLitePersistentCookieStore::Backend::DeleteCookie( - const net::CookieMonster::CanonicalCookie& cc) { + const net::CanonicalCookie& cc) { BatchOperation(PendingOperation::COOKIE_DELETE, cc); } void SQLitePersistentCookieStore::Backend::BatchOperation( PendingOperation::OperationType op, - const net::CookieMonster::CanonicalCookie& cc) { + const net::CanonicalCookie& cc) { // Commit every 30 seconds. static const int kCommitIntervalMs = 30 * 1000; // Commit right away if we have more than 512 outstanding operations. @@ -997,20 +997,18 @@ void SQLitePersistentCookieStore::LoadCookiesForKey( backend_->LoadCookiesForKey(key, loaded_callback); } -void SQLitePersistentCookieStore::AddCookie( - const net::CookieMonster::CanonicalCookie& cc) { +void SQLitePersistentCookieStore::AddCookie(const net::CanonicalCookie& cc) { if (backend_.get()) backend_->AddCookie(cc); } void SQLitePersistentCookieStore::UpdateCookieAccessTime( - const net::CookieMonster::CanonicalCookie& cc) { + const net::CanonicalCookie& cc) { if (backend_.get()) backend_->UpdateCookieAccessTime(cc); } -void SQLitePersistentCookieStore::DeleteCookie( - const net::CookieMonster::CanonicalCookie& cc) { +void SQLitePersistentCookieStore::DeleteCookie(const net::CanonicalCookie& cc) { if (backend_.get()) backend_->DeleteCookie(cc); } diff --git a/chrome/browser/net/sqlite_persistent_cookie_store.h b/chrome/browser/net/sqlite_persistent_cookie_store.h index 649fe3b..72675da 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store.h +++ b/chrome/browser/net/sqlite_persistent_cookie_store.h @@ -19,6 +19,10 @@ class ClearOnExitPolicy; class FilePath; class Task; +namespace net { +class CanonicalCookie; +} + // Implements the PersistentCookieStore interface in terms of a SQLite database. // For documentation about the actual member functions consult the documentation // of the parent class |net::CookieMonster::PersistentCookieStore|. @@ -38,12 +42,9 @@ class SQLitePersistentCookieStore virtual void Load(const LoadedCallback& loaded_callback) OVERRIDE; virtual void LoadCookiesForKey(const std::string& key, const LoadedCallback& callback) OVERRIDE; - virtual void AddCookie( - const net::CookieMonster::CanonicalCookie& cc) OVERRIDE; - virtual void UpdateCookieAccessTime( - const net::CookieMonster::CanonicalCookie& cc) OVERRIDE; - virtual void DeleteCookie( - const net::CookieMonster::CanonicalCookie& cc) OVERRIDE; + virtual void AddCookie(const net::CanonicalCookie& cc) OVERRIDE; + virtual void UpdateCookieAccessTime(const net::CanonicalCookie& cc) OVERRIDE; + virtual void DeleteCookie(const net::CanonicalCookie& cc) OVERRIDE; virtual void SetForceKeepSessionState() OVERRIDE; virtual void Flush(const base::Closure& callback) OVERRIDE; diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc index 88d614fc..6fea67d 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_perftest.cc @@ -13,6 +13,7 @@ #include "chrome/common/chrome_constants.h" #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.h" +#include "net/cookies/canonical_cookie.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; @@ -26,14 +27,12 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test { key_loaded_event_(false, false) { } - void OnLoaded( - const std::vector<net::CookieMonster::CanonicalCookie*>& cookies) { + void OnLoaded(const std::vector<net::CanonicalCookie*>& cookies) { cookies_ = cookies; loaded_event_.Signal(); } - void OnKeyLoaded( - const std::vector<net::CookieMonster::CanonicalCookie*>& cookies) { + void OnKeyLoaded(const std::vector<net::CanonicalCookie*>& cookies) { cookies_ = cookies; key_loaded_event_.Signal(); } @@ -51,7 +50,7 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test { store_ = new SQLitePersistentCookieStore( temp_dir_.path().Append(chrome::kCookieFilename), false, NULL); - std::vector<net::CookieMonster::CanonicalCookie*> cookies; + std::vector<net::CanonicalCookie*> cookies; Load(); ASSERT_EQ(0u, cookies_.size()); // Creates 15000 cookies from 300 eTLD+1s. @@ -62,10 +61,10 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test { for (int cookie_num = 0; cookie_num < 50; ++cookie_num) { t += base::TimeDelta::FromInternalValue(10); store_->AddCookie( - net::CookieMonster::CanonicalCookie(gurl, - base::StringPrintf("Cookie_%d", cookie_num), "1", - domain_name, "/", std::string(), std::string(), - t, t, t, false, false)); + net::CanonicalCookie(gurl, + base::StringPrintf("Cookie_%d", cookie_num), "1", + domain_name, "/", std::string(), std::string(), + t, t, t, false, false)); } } // Replace the store effectively destroying the current one and forcing it @@ -86,7 +85,7 @@ class SQLitePersistentCookieStorePerfTest : public testing::Test { content::TestBrowserThread io_thread_; base::WaitableEvent loaded_event_; base::WaitableEvent key_loaded_event_; - std::vector<net::CookieMonster::CanonicalCookie*> cookies_; + std::vector<net::CanonicalCookie*> cookies_; ScopedTempDir temp_dir_; scoped_refptr<SQLitePersistentCookieStore> store_; }; diff --git a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc index 384332d..cc01220 100644 --- a/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc +++ b/chrome/browser/net/sqlite_persistent_cookie_store_unittest.cc @@ -20,15 +20,15 @@ #include "chrome/common/chrome_constants.h" #include "content/public/test/test_browser_thread.h" #include "googleurl/src/gurl.h" +#include "net/cookies/canonical_cookie.h" #include "sql/connection.h" #include "sql/meta_table.h" #include "testing/gtest/include/gtest/gtest.h" #include "webkit/quota/mock_special_storage_policy.h" using content::BrowserThread; -using net::CookieMonster; -typedef std::vector<CookieMonster::CanonicalCookie*> CanonicalCookieVector; +typedef std::vector<net::CanonicalCookie*> CanonicalCookieVector; class SQLitePersistentCookieStoreTest : public testing::Test { public: @@ -96,10 +96,9 @@ class SQLitePersistentCookieStoreTest : public testing::Test { const std::string& path, const base::Time& creation) { store_->AddCookie( - CookieMonster::CanonicalCookie(GURL(), name, value, domain, path, - std::string(), std::string(), - creation, creation, creation, - false, false)); + net::CanonicalCookie(GURL(), name, value, domain, path, std::string(), + std::string(), creation, creation, creation, false, + false)); } virtual void SetUp() { @@ -333,7 +332,7 @@ TEST_F(SQLitePersistentCookieStoreTest, TestLoadOldSessionCookies) { // Add a session cookie. store_->AddCookie( - CookieMonster::CanonicalCookie( + net::CanonicalCookie( GURL(), "C", "D", "sessioncookie.com", "/", std::string(), std::string(), base::Time::Now(), base::Time(), base::Time::Now(), false, false)); @@ -360,7 +359,7 @@ TEST_F(SQLitePersistentCookieStoreTest, TestDontLoadOldSessionCookies) { // Add a session cookie. store_->AddCookie( - CookieMonster::CanonicalCookie( + net::CanonicalCookie( GURL(), "C", "D", "sessioncookie.com", "/", std::string(), std::string(), base::Time::Now(), base::Time(), base::Time::Now(), false, false)); @@ -391,14 +390,14 @@ TEST_F(SQLitePersistentCookieStoreTest, PersistIsPersistent) { // Add a session cookie. store_->AddCookie( - CookieMonster::CanonicalCookie( + net::CanonicalCookie( GURL(), kSessionName, "val", "sessioncookie.com", "/", std::string(), std::string(), base::Time::Now(), base::Time(), base::Time::Now(), false, false)); // Add a persistent cookie. store_->AddCookie( - CookieMonster::CanonicalCookie( + net::CanonicalCookie( GURL(), kPersistentName, "val", "sessioncookie.com", "/", std::string(), std::string(), base::Time::Now() - base::TimeDelta::FromDays(1), base::Time::Now(), @@ -410,14 +409,14 @@ TEST_F(SQLitePersistentCookieStoreTest, PersistIsPersistent) { CreateAndLoad(true, &cookies); ASSERT_EQ(2U, cookies.size()); - std::map<std::string, CookieMonster::CanonicalCookie*> cookie_map; + std::map<std::string, net::CanonicalCookie*> cookie_map; for (CanonicalCookieVector::const_iterator it = cookies.begin(); it != cookies.end(); ++it) { cookie_map[(*it)->Name()] = *it; } - std::map<std::string, CookieMonster::CanonicalCookie*>::const_iterator it = + std::map<std::string, net::CanonicalCookie*>::const_iterator it = cookie_map.find(kSessionName); ASSERT_TRUE(it != cookie_map.end()); EXPECT_FALSE(cookie_map[kSessionName]->IsPersistent()); @@ -482,10 +481,8 @@ TEST_F(SQLitePersistentCookieStoreTest, TestClearOnExitPolicy) { // A secure cookie on session_origin. t += base::TimeDelta::FromInternalValue(10); store_->AddCookie( - CookieMonster::CanonicalCookie(GURL(), "D", "4", session_origin, "/", - std::string(), std::string(), - t, t, t, - true, false)); + net::CanonicalCookie(GURL(), "D", "4", session_origin, "/", std::string(), + std::string(), t, t, t, true, false)); // First, check that we can override the policy. store_->SetForceKeepSessionState(); diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index 2861e3e..494821a 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -52,6 +52,8 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_context.h" #include "net/base/server_bound_cert_service.h" +#include "net/cookies/canonical_cookie.h" +#include "net/cookies/cookie_monster.h" #include "net/http/http_transaction_factory.h" #include "net/http/http_util.h" #include "net/proxy/proxy_config_service_fixed.h" @@ -86,7 +88,7 @@ class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate { // net::CookieMonster::Delegate implementation. virtual void OnCookieChanged( - const net::CookieMonster::CanonicalCookie& cookie, + const net::CanonicalCookie& cookie, bool removed, net::CookieMonster::Delegate::ChangeCause cause) { BrowserThread::PostTask( @@ -99,7 +101,7 @@ class ChromeCookieMonsterDelegate : public net::CookieMonster::Delegate { virtual ~ChromeCookieMonsterDelegate() {} void OnCookieChangedAsyncHelper( - const net::CookieMonster::CanonicalCookie& cookie, + const net::CanonicalCookie& cookie, bool removed, net::CookieMonster::Delegate::ChangeCause cause) { Profile* profile = profile_getter_.Run(); diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.h b/chrome/browser/ui/cocoa/content_settings/cookie_details.h index 708de3b..836bff1 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.h +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.h @@ -8,11 +8,14 @@ #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" -#include "net/cookies/cookie_monster.h" #include "webkit/appcache/appcache_service.h" class CookieTreeNode; +namespace net { +class CanonicalCookie; +} + // This enum specifies the type of information contained in the // cookie details. enum CocoaCookieDetailsType { @@ -161,7 +164,7 @@ enum CocoaCookieDetailsType { - (id)initAsFolder; // Used for cookie details in both the cookie tree and the cookie prompt dialog. -- (id)initWithCookie:(const net::CookieMonster::CanonicalCookie*)treeNode +- (id)initWithCookie:(const net::CanonicalCookie*)treeNode canEditExpiration:(BOOL)canEditExpiration; // Used for database details in the cookie tree. diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm index 6483e1f..6b87ee9 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm @@ -10,6 +10,7 @@ #include "chrome/browser/cookies_tree_model.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/text/bytes_formatting.h" +#include "net/cookies/canonical_cookie.h" #include "webkit/appcache/appcache_service.h" #pragma mark Cocoa Cookie Details @@ -116,7 +117,7 @@ return self; } -- (id)initWithCookie:(const net::CookieMonster::CanonicalCookie*)cookie +- (id)initWithCookie:(const net::CanonicalCookie*)cookie canEditExpiration:(BOOL)canEditExpiration { if ((self = [super init])) { type_ = kCocoaCookieDetailsTypeCookie; diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm index 0cf3ac5..e54976c 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_unittest.mm @@ -6,6 +6,7 @@ #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" #include "googleurl/src/gurl.h" +#include "net/cookies/canonical_cookie.h" #include "net/cookies/parsed_cookie.h" #import "testing/gtest_mac.h" @@ -27,7 +28,7 @@ TEST_F(CookiesDetailsTest, CreateForCookie) { std::string cookieLine( "PHPSESSID=0123456789abcdef0123456789abcdef; path=/"); net::ParsedCookie pc(cookieLine); - net::CookieMonster::CanonicalCookie cookie(url, pc); + net::CanonicalCookie cookie(url, pc); details.reset([[CocoaCookieDetails alloc] initWithCookie:&cookie canEditExpiration:NO]); diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm index d32af29..0a3aae7 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller_unittest.mm @@ -6,6 +6,7 @@ #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 { @@ -18,7 +19,7 @@ static CocoaCookieDetails* CreateTestCookieDetails(BOOL canEditExpiration) { 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]; diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc index d2946ca..302e3b1 100644 --- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc +++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc @@ -32,6 +32,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" +#include "net/cookies/canonical_cookie.h" #include "ui/base/gtk/gtk_hig_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc index b298cea..074a9a8 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc @@ -7,6 +7,7 @@ #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" @@ -464,7 +465,7 @@ void gtk_chrome_cookie_view_clear(GtkChromeCookieView* self) { 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_), @@ -519,7 +520,7 @@ void gtk_chrome_cookie_view_display_cookie_string( 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, diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h index 51564fd..2f72490 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h +++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.h @@ -13,10 +13,13 @@ #include "chrome/browser/browsing_data_database_helper.h" #include "chrome/browser/browsing_data_indexed_db_helper.h" #include "chrome/browser/browsing_data_local_storage_helper.h" -#include "net/cookies/cookie_monster.h" class GURL; +namespace net { +class CanonicalCookie; +} + G_BEGIN_DECLS #define GTK_TYPE_CHROME_COOKIE_VIEW gtk_chrome_cookie_view_get_type() @@ -139,7 +142,7 @@ G_END_DECLS void gtk_chrome_cookie_view_display_cookie( GtkChromeCookieView* widget, const std::string& domain, - const net::CookieMonster::CanonicalCookie& cookie); + const net::CanonicalCookie& cookie); // Looks up the cookie_line in CookieMonster and displays that. void gtk_chrome_cookie_view_display_cookie_string( diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index ab36bf5..fa3da03 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -31,6 +31,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "net/cookies/canonical_cookie.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index c449eef..991b0e3 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -14,6 +14,7 @@ #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" @@ -59,9 +60,8 @@ CookieInfoView::CookieInfoView(bool editable_expiration_date) 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)); @@ -97,7 +97,7 @@ void CookieInfoView::SetCookie( 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); } diff --git a/chrome/browser/ui/views/cookie_info_view.h b/chrome/browser/ui/views/cookie_info_view.h index e673821..f72723b 100644 --- a/chrome/browser/ui/views/cookie_info_view.h +++ b/chrome/browser/ui/views/cookie_info_view.h @@ -11,7 +11,6 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/string16.h" -#include "net/cookies/cookie_monster.h" #include "ui/base/models/combobox_model.h" #include "ui/views/controls/combobox/combobox_listener.h" #include "ui/views/view.h" @@ -22,6 +21,9 @@ class Label; class Textfield; } +namespace net { +class CanonicalCookie; +} /////////////////////////////////////////////////////////////////////////////// // CookieInfoViewDelegate @@ -47,7 +49,7 @@ class CookieInfoView : public views::View, // Update the display from the specified CookieNode. void SetCookie(const std::string& domain, - const net::CookieMonster::CanonicalCookie& cookie_node); + const net::CanonicalCookie& cookie_node); // Update the display from the specified cookie string. void SetCookieString(const GURL& url, const std::string& cookie_line); diff --git a/chrome/browser/ui/webui/cookies_tree_model_util.cc b/chrome/browser/ui/webui/cookies_tree_model_util.cc index 7607c98..b257b39 100644 --- a/chrome/browser/ui/webui/cookies_tree_model_util.cc +++ b/chrome/browser/ui/webui/cookies_tree_model_util.cc @@ -14,6 +14,7 @@ #include "base/values.h" #include "chrome/browser/cookies_tree_model.h" #include "grit/generated_resources.h" +#include "net/cookies/canonical_cookie.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/text/bytes_formatting.h" @@ -107,8 +108,7 @@ bool CookiesTreeModelUtil::GetCookieTreeNodeDictionary( dict->SetString(kKeyType, "cookie"); dict->SetString(kKeyIcon, "chrome://theme/IDR_COOKIE_ICON"); - const net::CookieMonster::CanonicalCookie& cookie = - *node.GetDetailedInfo().cookie; + const net::CanonicalCookie& cookie = *node.GetDetailedInfo().cookie; dict->SetString(kKeyName, cookie.Name()); dict->SetString(kKeyContent, cookie.Value()); |