| Index: extensions/browser/process_manager.cc
|
| diff --git a/extensions/browser/process_manager.cc b/extensions/browser/process_manager.cc
|
| index 581219b6d3513a8c9c79f712c7949a82de661b66..c3eaad55a1763c4157733c7a58c127962f6d598b 100644
|
| --- a/extensions/browser/process_manager.cc
|
| +++ b/extensions/browser/process_manager.cc
|
| @@ -8,6 +8,7 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| +#include "base/macros.h"
|
| #include "base/message_loop/message_loop.h"
|
| #include "base/metrics/histogram_macros.h"
|
| #include "base/stl_util.h"
|
| @@ -136,7 +137,7 @@ struct ProcessManager::BackgroundPageData {
|
| // is active. A copy of the ID is also passed in the callbacks and IPC
|
| // messages leading up to CloseLazyBackgroundPageNow. The process is aborted
|
| // if the IDs ever differ due to new activity.
|
| - uint64 close_sequence_id;
|
| + uint64_t close_sequence_id;
|
|
|
| // Keeps track of when this page was last suspended. Used for perf metrics.
|
| linked_ptr<base::ElapsedTimer> since_suspended;
|
| @@ -543,7 +544,7 @@ void ProcessManager::OnKeepaliveFromPlugin(int render_process_id,
|
| }
|
|
|
| void ProcessManager::OnShouldSuspendAck(const std::string& extension_id,
|
| - uint64 sequence_id) {
|
| + uint64_t sequence_id) {
|
| ExtensionHost* host = GetBackgroundHostForExtension(extension_id);
|
| if (host &&
|
| sequence_id == background_page_data_[extension_id].close_sequence_id) {
|
| @@ -553,7 +554,7 @@ void ProcessManager::OnShouldSuspendAck(const std::string& extension_id,
|
|
|
| void ProcessManager::OnSuspendAck(const std::string& extension_id) {
|
| background_page_data_[extension_id].is_closing = true;
|
| - uint64 sequence_id = background_page_data_[extension_id].close_sequence_id;
|
| + uint64_t sequence_id = background_page_data_[extension_id].close_sequence_id;
|
| base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&ProcessManager::CloseLazyBackgroundPageNow,
|
| @@ -565,7 +566,7 @@ void ProcessManager::OnSuspendAck(const std::string& extension_id) {
|
|
|
| void ProcessManager::OnNetworkRequestStarted(
|
| content::RenderFrameHost* render_frame_host,
|
| - uint64 request_id) {
|
| + uint64_t request_id) {
|
| ExtensionHost* host = GetBackgroundHostForExtension(
|
| GetExtensionID(render_frame_host));
|
| auto result = pending_network_requests_.insert(request_id);
|
| @@ -578,7 +579,7 @@ void ProcessManager::OnNetworkRequestStarted(
|
|
|
| void ProcessManager::OnNetworkRequestDone(
|
| content::RenderFrameHost* render_frame_host,
|
| - uint64 request_id) {
|
| + uint64_t request_id) {
|
| ExtensionHost* host = GetBackgroundHostForExtension(
|
| GetExtensionID(render_frame_host));
|
| if (host && IsFrameInExtensionHost(host, render_frame_host)) {
|
| @@ -819,7 +820,7 @@ void ProcessManager::OnKeepaliveImpulseCheck() {
|
| }
|
|
|
| void ProcessManager::OnLazyBackgroundPageIdle(const std::string& extension_id,
|
| - uint64 sequence_id) {
|
| + uint64_t sequence_id) {
|
| ExtensionHost* host = GetBackgroundHostForExtension(extension_id);
|
| if (host && !background_page_data_[extension_id].is_closing &&
|
| sequence_id == background_page_data_[extension_id].close_sequence_id) {
|
| @@ -845,7 +846,7 @@ void ProcessManager::OnLazyBackgroundPageActive(
|
| }
|
|
|
| void ProcessManager::CloseLazyBackgroundPageNow(const std::string& extension_id,
|
| - uint64 sequence_id) {
|
| + uint64_t sequence_id) {
|
| ExtensionHost* host = GetBackgroundHostForExtension(extension_id);
|
| if (host &&
|
| sequence_id == background_page_data_[extension_id].close_sequence_id) {
|
|
|