diff options
| author | mmenke <mmenke@chromium.org> | 2016-02-25 10:56:46 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-25 18:58:09 +0000 |
| commit | 0a7a0bb8fda486fc471db2e6ec44621a201388dd (patch) | |
| tree | dc578aead3bbcb7c9f4d17ee646c45b8ef6abfed /ios/net | |
| parent | b1592675744d6ebd5f7968daf455c34703ba9488 (diff) | |
| download | chromium_src-0a7a0bb8fda486fc471db2e6ec44621a201388dd.zip chromium_src-0a7a0bb8fda486fc471db2e6ec44621a201388dd.tar.gz chromium_src-0a7a0bb8fda486fc471db2e6ec44621a201388dd.tar.bz2 | |
Remove CookieStore::GetCookieMonster.
A bunch of CookieStore consumers were depending on CookieMonster instead
of CookieStore. Now that they've been fixed, remove GetCookieMonster to
avoid any such dependencies from cropping up in the future.
BUG=579653
Review URL: https://codereview.chromium.org/1697003002
Cr-Commit-Position: refs/heads/master@{#377629}
Diffstat (limited to 'ios/net')
| -rw-r--r-- | ios/net/cookies/cookie_store_ios.h | 1 | ||||
| -rw-r--r-- | ios/net/cookies/cookie_store_ios.mm | 8 | ||||
| -rw-r--r-- | ios/net/cookies/cookie_store_ios_unittest.mm | 3 |
3 files changed, 0 insertions, 12 deletions
diff --git a/ios/net/cookies/cookie_store_ios.h b/ios/net/cookies/cookie_store_ios.h index 0e6a96fe..94bfc7c 100644 --- a/ios/net/cookies/cookie_store_ios.h +++ b/ios/net/cookies/cookie_store_ios.h @@ -141,7 +141,6 @@ class CookieStoreIOS : public net::CookieStore, void DeleteCanonicalCookieAsync( const CanonicalCookie& cookie, const DeleteCallback& callback) override; - net::CookieMonster* GetCookieMonster() override; void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, const base::Time& delete_end, const DeleteCallback& callback) override; diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm index 1d957b2..8be649a 100644 --- a/ios/net/cookies/cookie_store_ios.mm +++ b/ios/net/cookies/cookie_store_ios.mm @@ -649,14 +649,6 @@ void CookieStoreIOS::DeleteCanonicalCookieAsync( } } -// CookieStoreIOS is an implementation of CookieStore which is not a -// CookieMonster. As CookieStore is the main cookie API, a caller of -// GetCookieMonster must handle the case where this returns null. -net::CookieMonster* CookieStoreIOS::GetCookieMonster() { - DCHECK(thread_checker_.CalledOnValidThread()); - return nullptr; -} - void CookieStoreIOS::DeleteAllCreatedBetweenAsync( const base::Time& delete_begin, const base::Time& delete_end, diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm index 2de2139..4b5beb2 100644 --- a/ios/net/cookies/cookie_store_ios_unittest.mm +++ b/ios/net/cookies/cookie_store_ios_unittest.mm @@ -35,7 +35,6 @@ struct CookieStoreIOSTestTraits { return store; } - static const bool is_cookie_monster = false; static const bool supports_http_only = false; static const bool supports_non_dotted_domains = false; static const bool preserves_trailing_dots = false; @@ -142,8 +141,6 @@ class RoundTripTestCookieStore : public net::CookieStore { store_->DeleteCanonicalCookieAsync(cookie, callback); } - net::CookieMonster* GetCookieMonster() override { return nullptr; } - void DeleteAllCreatedBetweenAsync(const base::Time& delete_begin, const base::Time& delete_end, const DeleteCallback& callback) override { |