summaryrefslogtreecommitdiffstats
path: root/ios/net
diff options
context:
space:
mode:
authornharper <nharper@chromium.org>2016-03-09 10:58:07 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-09 18:59:43 +0000
commit5babb5e60e65ec4b4f5015ce3985e07db3a4fa52 (patch)
treea710b0524aa5104fec3d206d6382dbe621430093 /ios/net
parentc1e26c7b4a6f7d692312f4de15996e33b1c10a90 (diff)
downloadchromium_src-5babb5e60e65ec4b4f5015ce3985e07db3a4fa52.zip
chromium_src-5babb5e60e65ec4b4f5015ce3985e07db3a4fa52.tar.gz
chromium_src-5babb5e60e65ec4b4f5015ce3985e07db3a4fa52.tar.bz2
Log whether the ephemerality of the ChannelIDStore and CookieStore are the same
BUG=548423 Review URL: https://codereview.chromium.org/1745373002 Cr-Commit-Position: refs/heads/master@{#380165}
Diffstat (limited to 'ios/net')
-rw-r--r--ios/net/cookies/cookie_store_ios.h2
-rw-r--r--ios/net/cookies/cookie_store_ios.mm4
-rw-r--r--ios/net/cookies/cookie_store_ios_unittest.mm4
3 files changed, 10 insertions, 0 deletions
diff --git a/ios/net/cookies/cookie_store_ios.h b/ios/net/cookies/cookie_store_ios.h
index 29feb38..c80e7d3e 100644
--- a/ios/net/cookies/cookie_store_ios.h
+++ b/ios/net/cookies/cookie_store_ios.h
@@ -162,6 +162,8 @@ class CookieStoreIOS : public net::CookieStore,
const std::string& name,
const CookieChangedCallback& callback) override;
+ bool IsEphemeral() override;
+
private:
// For tests.
friend struct CookieStoreIOSTestTraits;
diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index 0d5f001..32d760f 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -999,6 +999,10 @@ CookieStoreIOS::AddCallbackForCookie(const GURL& gurl,
return hook_map_[key]->Add(callback);
}
+bool CookieStoreIOS::IsEphemeral() {
+ return cookie_monster_->IsEphemeral();
+}
+
bool CookieStoreIOS::UpdateCacheForCookieFromSystem(
const GURL& gurl,
const std::string& name,
diff --git a/ios/net/cookies/cookie_store_ios_unittest.mm b/ios/net/cookies/cookie_store_ios_unittest.mm
index e37c5e9..c436cc9 100644
--- a/ios/net/cookies/cookie_store_ios_unittest.mm
+++ b/ios/net/cookies/cookie_store_ios_unittest.mm
@@ -179,6 +179,10 @@ class RoundTripTestCookieStore : public net::CookieStore {
return scoped_ptr<CookieStore::CookieChangedSubscription>();
}
+ bool IsEphemeral() override {
+ return store_->IsEphemeral();
+ }
+
private:
void RoundTrip() {
CookieStoreIOS::SwitchSynchronizedStore(store_.get(), dummy_store_.get());