Switch to standard integer types in chrome/browser/, part 2 of 4.

chrome/browser/memory/tab_manager.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 "chrome/browser/memory/tab_manager.h"
 
+#include <stddef.h>
+
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "ash/multi_profile_uma.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
+#include "base/macros.h"
 #include "base/memory/memory_pressure_monitor.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
@@ skipping 41 matching lines @@
 // If there has been no priority adjustment in this interval, assume the
 // machine was suspended and correct the timing statistics.
 const int kSuspendThresholdSeconds = kAdjustmentIntervalSeconds * 4;
 
 // The time during which a tab is protected from discarding after it stops being
 // audible.
 const int kAudioProtectionTimeSeconds = 60;
 
 // Returns a unique ID for a WebContents. Do not cast back to a pointer, as
 // the WebContents could be deleted if the user closed the tab.
-int64 IdFromWebContents(WebContents* web_contents) {
-  return reinterpret_cast<int64>(web_contents);
+int64_t IdFromWebContents(WebContents* web_contents) {
+  return reinterpret_cast<int64_t>(web_contents);
 }
 
-int FindTabStripModelById(int64 target_web_contents_id, TabStripModel** model) {
+int FindTabStripModelById(int64_t target_web_contents_id,
+                          TabStripModel** model) {
   DCHECK(model);
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     Browser* browser = *it;
     TabStripModel* local_model = browser->tab_strip_model();
     for (int idx = 0; idx < local_model->count(); idx++) {
       WebContents* web_contents = local_model->GetWebContentsAt(idx);
-      int64 web_contents_id = IdFromWebContents(web_contents);
+      int64_t web_contents_id = IdFromWebContents(web_contents);
       if (web_contents_id == target_web_contents_id) {
         *model = local_model;
         return idx;
       }
     }
   }
 
   return -1;
 }
 
@@ skipping 88 matching lines @@
 // such as tabs created with JavaScript window.open(). Potentially consider
 // discarding the entire set together, or use that in the priority computation.
 bool TabManager::DiscardTab() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   TabStatsList stats = GetTabStats();
   if (stats.empty())
     return false;
   // Loop until a non-discarded tab to kill is found.
   for (TabStatsList::const_reverse_iterator stats_rit = stats.rbegin();
        stats_rit != stats.rend(); ++stats_rit) {
-    int64 least_important_tab_id = stats_rit->tab_contents_id;
+    int64_t least_important_tab_id = stats_rit->tab_contents_id;
     if (CanDiscardTab(least_important_tab_id) &&
         DiscardTabById(least_important_tab_id))
       return true;
   }
   return false;
 }
 
-WebContents* TabManager::DiscardTabById(int64 target_web_contents_id) {
+WebContents* TabManager::DiscardTabById(int64_t target_web_contents_id) {
   TabStripModel* model;
   int index = FindTabStripModelById(target_web_contents_id, &model);
 
   if (index == -1)
     return nullptr;
 
   VLOG(1) << "Discarding tab " << index << " id " << target_web_contents_id;
 
   return DiscardWebContentsAt(index, model);
 }
@@ skipping 211 matching lines @@
   }
   last_adjust_time_ = TimeTicks::Now();
 
 #if defined(OS_CHROMEOS)
   TabStatsList stats_list = GetTabStats();
   // This starts the CrOS specific OOM adjustments in /proc/<pid>/oom_score_adj.
   delegate_->AdjustOomPriorities(stats_list);
 #endif
 }
 
-bool TabManager::CanDiscardTab(int64 target_web_contents_id) const {
+bool TabManager::CanDiscardTab(int64_t target_web_contents_id) const {
   TabStripModel* model;
   int idx = FindTabStripModelById(target_web_contents_id, &model);
 
   if (idx == -1)
     return false;
 
   WebContents* web_contents = model->GetWebContentsAt(idx);
 
   // Do not discard tabs that don't have a valid URL (most probably they have
   // just been opened and dicarding them would lose the URL).
@@ skipping 138 matching lines @@
   // sudden_termination_allowed false, and that covers too many common pages
   // with ad networks and statistics scripts.  Ideally check for beforeUnload
   // handlers, which are likely to present a dialog asking if the user wants to
   // discard state.  crbug.com/123049.
 
   // Being more recently active is more important.
   return first.last_active > second.last_active;
 }
 
 }  // namespace memory