Change CookieStore::DeleteCallback to take uint32_t.

chrome/browser/sessions/session_data_deleter.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
+#include <stdint.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/dom_storage_context.h"
 #include "content/public/browser/local_storage_usage_info.h"
 #include "content/public/browser/storage_partition.h"
 #include "net/cookies/cookie_store.h"
 #include "net/cookies/cookie_util.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "storage/browser/quota/special_storage_policy.h"
 
 namespace {
 
-void CookieDeleted(int num_cookies_deleted) {
-  DCHECK_EQ(1, num_cookies_deleted);
+void CookieDeleted(uint32_t num_cookies_deleted) {
+  DCHECK_EQ(1u, num_cookies_deleted);
 }
 
 class SessionDataDeleter
     : public base::RefCountedThreadSafe<SessionDataDeleter> {
  public:
   SessionDataDeleter(storage::SpecialStoragePolicy* storage_policy,
                      bool delete_only_by_session_only_policy);
 
   void Run(
       content::StoragePartition* storage_partition,
@@ skipping 11 matching lines @@
 
   // Deletes all cookies that are session only if
   // |delete_only_by_session_only_policy_| is false. Once completed or skipped,
   // this arranges for DeleteSessionOnlyOriginCookies to be called with a list
   // of all remaining cookies.
   void DeleteSessionCookiesOnIOThread(
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter);
 
   // Called when all session-only cookies have been deleted.
   void DeleteSessionCookiesDone(net::CookieStore* cookie_store,
-                                int num_deleted);
+                                uint32_t num_deleted);
 
   // Deletes the cookies in |cookies| that are for origins which are
   // session-only.
   void DeleteSessionOnlyOriginCookies(net::CookieStore* cookie_store,
                                       const net::CookieList& cookies);
 
   scoped_refptr<storage::SpecialStoragePolicy> storage_policy_;
   const bool delete_only_by_session_only_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionDataDeleter);
@@ skipping 54 matching lines @@
                    base::Unretained(cookie_store)));
   } else {
     cookie_store->DeleteSessionCookiesAsync(
         base::Bind(&SessionDataDeleter::DeleteSessionCookiesDone, this,
                    base::Unretained(cookie_store)));
   }
 }
 
 void SessionDataDeleter::DeleteSessionCookiesDone(
     net::CookieStore* cookie_store,
-    int num_deleted) {
+    uint32_t num_deleted) {
   // If these callbacks are invoked, |cookie_store| is gauranteed to still
   // exist, since deleting the CookieStore will cancel pending callbacks.
   cookie_store->GetAllCookiesAsync(
       base::Bind(&SessionDataDeleter::DeleteSessionOnlyOriginCookies, this,
                  base::Unretained(cookie_store)));
 }
 
 void SessionDataDeleter::DeleteSessionOnlyOriginCookies(
     net::CookieStore* cookie_store,
     const net::CookieList& cookies) {
@@ skipping 26 matching lines @@
       StartupBrowserCreator::GetSessionStartupPref(
           *base::CommandLine::ForCurrentProcess(), profile).type;
 #endif
 
   scoped_refptr<SessionDataDeleter> deleter(
       new SessionDataDeleter(profile->GetSpecialStoragePolicy(),
                              startup_pref_type == SessionStartupPref::LAST));
   deleter->Run(Profile::GetDefaultStoragePartition(profile),
                profile->GetRequestContext());
 }