Switch to standard integer types in content/browser/.

content/browser/plugin_data_remover_impl.cc

 // 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.
 
 #include "content/browser/plugin_data_remover_impl.h"
 
+#include <stdint.h>
+
 #include <limits>
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/version.h"
+#include "build/build_config.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/renderer_host/pepper/pepper_flash_file_message_filter.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/common/pepper_plugin_info.h"
 #include "ppapi/proxy/ppapi_messages.h"
 
 namespace content {
 
 namespace {
 
 // The minimum Flash Player version that implements NPP_ClearSiteData.
 const char kMinFlashVersion[] = "10.3";
-const int64 kRemovalTimeoutMs = 10000;
-const uint64 kClearAllData = 0;
+const int64_t kRemovalTimeoutMs = 10000;
+const uint64_t kClearAllData = 0;
 
 }  // namespace
 
 // static
 PluginDataRemover* PluginDataRemover::Create(BrowserContext* browser_context) {
   return new PluginDataRemoverImpl(browser_context);
 }
 
 // static
 void PluginDataRemover::GetSupportedPlugins(
@@ skipping 148 matching lines @@
     }
   }
 
   base::WaitableEvent* event() { return event_.get(); }
 
  private:
   friend struct BrowserThread::DeleteOnThread<BrowserThread::IO>;
   friend class base::DeleteHelper<Context>;
   ~Context() override {}
 
-  IPC::Message* CreatePpapiClearSiteDataMsg(uint64 max_age) {
+  IPC::Message* CreatePpapiClearSiteDataMsg(uint64_t max_age) {
     base::FilePath profile_path =
         PepperFlashFileMessageFilter::GetDataDirName(browser_context_path_);
     // TODO(vtl): This "duplicates" logic in webkit/plugins/ppapi/file_path.cc
     // (which prepends the plugin name to the relative part of the path
     // instead, with the absolute, profile-dependent part being enforced by
     // the browser).
 #if defined(OS_WIN)
     base::FilePath plugin_data_path =
         profile_path.Append(base::FilePath(base::UTF8ToUTF16(plugin_name_)));
 #else
@@ skipping 13 matching lines @@
       return;
 
     DCHECK(!channel_.get());
     channel_ = IPC::Channel::CreateClient(handle, this);
     if (!channel_->Connect()) {
       NOTREACHED() << "Couldn't connect to plugin";
       SignalDone();
       return;
     }
 
-    uint64 max_age = begin_time_.is_null() ?
-        std::numeric_limits<uint64>::max() :
-        (base::Time::Now() - begin_time_).InSeconds();
+    uint64_t max_age = begin_time_.is_null()
+                           ? std::numeric_limits<uint64_t>::max()
+                           : (base::Time::Now() - begin_time_).InSeconds();
 
     IPC::Message* msg;
     if (is_ppapi) {
       msg = CreatePpapiClearSiteDataMsg(max_age);
     } else {
       msg = new PluginProcessMsg_ClearSiteData(
           std::string(), kClearAllData, max_age);
     }
     if (!channel_->Send(msg)) {
       NOTREACHED() << "Couldn't send ClearSiteData message";
       SignalDone();
       return;
     }
   }
 
   // Handles the PpapiHostMsg_ClearSiteDataResult message by delegating to the
   // PluginProcessHostMsg_ClearSiteDataResult handler.
-  void OnPpapiClearSiteDataResult(uint32 request_id, bool success) {
+  void OnPpapiClearSiteDataResult(uint32_t request_id, bool success) {
     DCHECK_EQ(0u, request_id);
     OnClearSiteDataResult(success);
   }
 
   // Handles the PluginProcessHostMsg_ClearSiteDataResult message.
   void OnClearSiteDataResult(bool success) {
     LOG_IF(ERROR, !success) << "ClearSiteData returned error";
     UMA_HISTOGRAM_TIMES("ClearPluginData.time",
                         base::Time::Now() - remove_start_time_);
     SignalDone();
@@ skipping 42 matching lines @@
 
 base::WaitableEvent* PluginDataRemoverImpl::StartRemoving(
     base::Time begin_time) {
   DCHECK(!context_.get());
   context_ = new Context(begin_time, browser_context_);
   context_->Init(mime_type_);
   return context_->event();
 }
 
 }  // namespace content