commit 2cbccb7fa8907c3fa53840187e11613a5f307270
author eugenebut <eugenebut@chromium.org> Fri Dec 30 16:27:52 2016
committer Commit bot <commit-bot@chromium.org> Fri Dec 30 16:30:59 2016
tree 9d6698dfdec71971f17bc5b62ac47c611e305ed2
parent 5eb7f7c2186f03e5ad1e7825088320e0b772e587

Made CookieStoreIOS(PersistentCookieStore, NSHTTPCookieStorage) private.

This constructor is used only by implementation and should not be public

BUG=676144

Review-Url: https://codereview.chromium.org/2601103002
Cr-Commit-Position: refs/heads/master@{#441033}

ios/net/cookies/cookie_store_ios.h

diff --git a/ios/net/cookies/cookie_store_ios.h b/ios/net/cookies/cookie_store_ios.h
index 2c8218f1..2870bde 100644
--- a/ios/net/cookies/cookie_store_ios.h
+++ b/ios/net/cookies/cookie_store_ios.h
@@ -59,10 +59,6 @@
   explicit CookieStoreIOS(
       net::CookieMonster::PersistentCookieStore* persistent_store);
 
-  explicit CookieStoreIOS(
-      net::CookieMonster::PersistentCookieStore* persistent_store,
-      NSHTTPCookieStorage* system_store);
-
   ~CookieStoreIOS() override;
 
   enum CookiePolicy { ALLOW, BLOCK };
@@ -148,6 +144,10 @@
   void SetSynchronizedWithSystemStore(bool synchronized);
 
  private:
+  CookieStoreIOS(
+      net::CookieMonster::PersistentCookieStore* persistent_store,
+      NSHTTPCookieStorage* system_store);
+
   // For tests.
   friend struct CookieStoreIOSTestTraits;
 

ios/net/cookies/cookie_store_ios.mm

diff --git a/ios/net/cookies/cookie_store_ios.mm b/ios/net/cookies/cookie_store_ios.mm
index c34383b..6da4c38 100644
--- a/ios/net/cookies/cookie_store_ios.mm
+++ b/ios/net/cookies/cookie_store_ios.mm
@@ -287,25 +287,6 @@
                      [NSHTTPCookieStorage sharedHTTPCookieStorage]) {
 }
 
-CookieStoreIOS::CookieStoreIOS(
-    net::CookieMonster::PersistentCookieStore* persistent_store,
-    NSHTTPCookieStorage* system_store)
-    : cookie_monster_(new net::CookieMonster(persistent_store, nullptr)),
-      system_store_(system_store),
-      creation_time_manager_(new CookieCreationTimeManager),
-      metrics_enabled_(false),
-      flush_delay_(base::TimeDelta::FromSeconds(10)),
-      synchronization_state_(NOT_SYNCHRONIZED),
-      cookie_cache_(new CookieCache()),
-      weak_factory_(this) {
-  DCHECK(system_store);
-
-  NotificationTrampoline::GetInstance()->AddObserver(this);
-
-  cookie_monster_->SetPersistSessionCookies(true);
-  cookie_monster_->SetForceKeepSessionState();
-}
-
 CookieStoreIOS::~CookieStoreIOS() {
   NotificationTrampoline::GetInstance()->RemoveObserver(this);
 }
@@ -724,6 +705,25 @@
 #pragma mark -
 #pragma mark Private methods
 
+CookieStoreIOS::CookieStoreIOS(
+    net::CookieMonster::PersistentCookieStore* persistent_store,
+    NSHTTPCookieStorage* system_store)
+    : cookie_monster_(new net::CookieMonster(persistent_store, nullptr)),
+      system_store_(system_store),
+      creation_time_manager_(new CookieCreationTimeManager),
+      metrics_enabled_(false),
+      flush_delay_(base::TimeDelta::FromSeconds(10)),
+      synchronization_state_(NOT_SYNCHRONIZED),
+      cookie_cache_(new CookieCache()),
+      weak_factory_(this) {
+  DCHECK(system_store);
+
+  NotificationTrampoline::GetInstance()->AddObserver(this);
+
+  cookie_monster_->SetPersistSessionCookies(true);
+  cookie_monster_->SetForceKeepSessionState();
+}
+
 void CookieStoreIOS::ClearSystemStore() {
   DCHECK(thread_checker_.CalledOnValidThread());
   base::scoped_nsobject<NSArray> copy(