Switch to standard integer types in content/browser/.

content/browser/dom_storage/dom_storage_context_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 #define CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_
 
+#include <stdint.h>
+
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/atomic_sequence_num.h"
-#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "base/time/time.h"
 #include "content/common/content_export.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
@@ skipping 74 matching lines @@
     return localstorage_directory_;
   }
 
   // Returns the directory path for sessionStorage, or an empty directory, if
   // there is no backing on disk.
   const base::FilePath& sessionstorage_directory() {
     return sessionstorage_directory_;
   }
 
   DOMStorageTaskRunner* task_runner() const { return task_runner_.get(); }
-  DOMStorageNamespace* GetStorageNamespace(int64 namespace_id);
+  DOMStorageNamespace* GetStorageNamespace(int64_t namespace_id);
 
   void GetLocalStorageUsage(std::vector<LocalStorageUsageInfo>* infos,
                             bool include_file_info);
   void GetSessionStorageUsage(std::vector<SessionStorageUsageInfo>* infos);
   void DeleteLocalStorage(const GURL& origin);
   void DeleteSessionStorage(const SessionStorageUsageInfo& usage_info);
 
   // Used by content settings to alter the behavior around
   // what data to keep and what data to discard at shutdown.
   // The policy is not so straight forward to describe, see
@@ skipping 25 matching lines @@
   void NotifyItemRemoved(
       const DOMStorageArea* area,
       const base::string16& key,
       const base::string16& old_value,
       const GURL& page_url);
   void NotifyAreaCleared(
       const DOMStorageArea* area,
       const GURL& page_url);
 
   // May be called on any thread.
-  int64 AllocateSessionId();
+  int64_t AllocateSessionId();
   std::string AllocatePersistentSessionId();
 
   // Must be called on the background thread.
-  void CreateSessionNamespace(int64 namespace_id,
+  void CreateSessionNamespace(int64_t namespace_id,
                               const std::string& persistent_namespace_id);
-  void DeleteSessionNamespace(int64 namespace_id, bool should_persist_data);
-  void CloneSessionNamespace(int64 existing_id, int64 new_id,
+  void DeleteSessionNamespace(int64_t namespace_id, bool should_persist_data);
+  void CloneSessionNamespace(int64_t existing_id,
+                             int64_t new_id,
                              const std::string& new_persistent_id);
 
   // Starts backing sessionStorage on disk. This function must be called right
   // after DOMStorageContextImpl is created, before it's used.
   void SetSaveSessionStorageOnDisk();
 
   // Deletes all namespaces which don't have an associated DOMStorageNamespace
   // alive. This function is used for deleting possible leftover data after an
   // unclean exit.
   void StartScavengingUnusedSessionStorage();
 
  private:
   friend class DOMStorageContextImplTest;
   FRIEND_TEST_ALL_PREFIXES(DOMStorageContextImplTest, Basics);
   friend class base::RefCountedThreadSafe<DOMStorageContextImpl>;
-  typedef std::map<int64, scoped_refptr<DOMStorageNamespace> >
+  typedef std::map<int64_t, scoped_refptr<DOMStorageNamespace>>
       StorageNamespaceMap;
 
   ~DOMStorageContextImpl();
 
   void ClearSessionOnlyOrigins();
 
   // For scavenging unused sessionStorages.
   void FindUnusedNamespaces();
   void FindUnusedNamespacesInCommitSequence(
       const std::set<std::string>& namespace_ids_in_use,
@@ skipping 33 matching lines @@
   // For cleaning up unused namespaces gradually.
   bool scavenging_started_;
   std::vector<std::string> deletable_persistent_namespace_ids_;
 
   // Persistent namespace IDs to protect from gradual deletion (they will
   // be needed for session restore).
   std::set<std::string> protected_persistent_session_ids_;
 
   // Mapping between persistent namespace IDs and namespace IDs for
   // sessionStorage.
-  std::map<std::string, int64> persistent_namespace_id_to_namespace_id_;
+  std::map<std::string, int64_t> persistent_namespace_id_to_namespace_id_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_DOM_STORAGE_DOM_STORAGE_CONTEXT_IMPL_H_