Cleanup: Make CookieMonster::SetCookieableSchemes take a const char* …

…const array. Review URL: https://codereview.chromium.org/345363002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279165 0039d316-1c4b-4281-b951-d872f2087c98
Denger-Network · Jun 23, 2014 · 5edff3c · 5edff3c
1 parent a72191a
commit 5edff3c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/chrome/browser/profiles/off_the_record_profile_io_data.cc b/chrome/browser/profiles/off_the_record_profile_io_data.cc
@@ -293,9 +293,11 @@ void OffTheRecordProfileIOData::
       content::CreateCookieStore(content::CookieStoreConfig())->
           GetCookieMonster();
   // Enable cookies for devtools and extension URLs.
-  const char* schemes[] = {content::kChromeDevToolsScheme,
-                           extensions::kExtensionScheme};
-  extensions_cookie_store->SetCookieableSchemes(schemes, 2);
+  const char* const schemes[] = {
+      content::kChromeDevToolsScheme,
+      extensions::kExtensionScheme
+  };
+  extensions_cookie_store->SetCookieableSchemes(schemes, arraysize(schemes));
   extensions_context->set_cookie_store(extensions_cookie_store);
 
   scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(

diff --git a/chrome/browser/profiles/profile_impl_io_data.cc b/chrome/browser/profiles/profile_impl_io_data.cc
@@ -564,9 +564,12 @@ void ProfileImplIOData::
   net::CookieStore* extensions_cookie_store =
       content::CreateCookieStore(cookie_config);
   // Enable cookies for devtools and extension URLs.
-  const char* schemes[] = {content::kChromeDevToolsScheme,
-                           extensions::kExtensionScheme};
-  extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(schemes, 2);
+  const char* const schemes[] = {
+      content::kChromeDevToolsScheme,
+      extensions::kExtensionScheme
+  };
+  extensions_cookie_store->GetCookieMonster()->SetCookieableSchemes(
+      schemes, arraysize(schemes));
   extensions_context->set_cookie_store(extensions_cookie_store);
 
   scoped_ptr<net::URLRequestJobFactoryImpl> extensions_job_factory(

diff --git a/chrome/test/base/testing_profile.cc b/chrome/test/base/testing_profile.cc
@@ -136,8 +136,8 @@ class TestExtensionURLRequestContext : public net::URLRequestContext {
     net::CookieMonster* cookie_monster =
         content::CreateCookieStore(content::CookieStoreConfig())->
             GetCookieMonster();
-    const char* schemes[] = {extensions::kExtensionScheme};
-    cookie_monster->SetCookieableSchemes(schemes, 1);
+    const char* const schemes[] = {extensions::kExtensionScheme};
+    cookie_monster->SetCookieableSchemes(schemes, arraysize(schemes));
     set_cookie_store(cookie_monster);
   }
 

diff --git a/net/cookies/cookie_monster.cc b/net/cookies/cookie_monster.cc
@@ -217,7 +217,7 @@ void SortLeastRecentlyAccessed(
 // Predicate to support PartitionCookieByPriority().
 struct CookiePriorityEqualsTo
     : std::unary_function<const CookieMonster::CookieMap::iterator, bool> {
-  CookiePriorityEqualsTo(CookiePriority priority)
+  explicit CookiePriorityEqualsTo(CookiePriority priority)
     : priority_(priority) {}
 
   bool operator()(const CookieMonster::CookieMap::iterator it) const {
@@ -845,7 +845,6 @@ class CookieMonster::DeleteSessionCookiesTask : public DeleteTask<int> {
   virtual ~DeleteSessionCookiesTask() {}
 
  private:
-
   DISALLOW_COPY_AND_ASSIGN(DeleteSessionCookiesTask);
 };
 
@@ -1264,7 +1263,7 @@ bool CookieMonster::DeleteCanonicalCookie(const CanonicalCookie& cookie) {
   return false;
 }
 
-void CookieMonster::SetCookieableSchemes(const char* schemes[],
+void CookieMonster::SetCookieableSchemes(const char* const schemes[],
                                          size_t num_schemes) {
   base::AutoLock autolock(lock_);
 
@@ -1668,7 +1667,7 @@ int CookieMonster::TrimDuplicateCookiesForKey(
 }
 
 // Note: file must be the last scheme.
-const char* CookieMonster::kDefaultCookieableSchemes[] =
+const char* const CookieMonster::kDefaultCookieableSchemes[] =
     { "http", "https", "ws", "wss", "file" };
 const int CookieMonster::kDefaultCookieableSchemesCount =
     arraysize(kDefaultCookieableSchemes);

diff --git a/net/cookies/cookie_monster.h b/net/cookies/cookie_monster.h
@@ -208,7 +208,7 @@ class NET_EXPORT CookieMonster : public CookieStore {
   // Resets the list of cookieable schemes to the supplied schemes.
   // If this this method is called, it must be called before first use of
   // the instance (i.e. as part of the instance initialization process).
-  void SetCookieableSchemes(const char* schemes[], size_t num_schemes);
+  void SetCookieableSchemes(const char* const schemes[], size_t num_schemes);
 
   // Resets the list of cookieable schemes to kDefaultCookieableSchemes with or
   // without 'file' being included.
@@ -304,7 +304,7 @@ class NET_EXPORT CookieMonster : public CookieStore {
   bool IsCookieableScheme(const std::string& scheme);
 
   // The default list of schemes the cookie monster can handle.
-  static const char* kDefaultCookieableSchemes[];
+  static const char* const kDefaultCookieableSchemes[];
   static const int kDefaultCookieableSchemesCount;
 
   // Copies all keys for the given |key| to another cookie monster |other|.