Revert of Remove kuint16max.

chrome/browser/extensions/webstore_installer.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/extensions/webstore_installer.h"
 
-#include <stdint.h>
-
-#include <limits>
 #include <set>
 #include <vector>
 
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/path_service.h"
 #include "base/rand_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 93 matching lines @@
       BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                               base::Bind(callback, base::FilePath()));
       return;
     }
   }
 
   // This is to help avoid a race condition between when we generate this
   // filename and when the download starts writing to it (think concurrently
   // running sharded browser tests installing the same test file, for
   // instance).
-  std::string random_number = base::Uint64ToString(
-      base::RandGenerator(std::numeric_limits<uint16_t>::max()));
+  std::string random_number =
+      base::Uint64ToString(base::RandGenerator(kuint16max));
 
   base::FilePath file =
       download_directory.AppendASCII(id + "_" + random_number + ".crx");
 
   int uniquifier =
       base::GetUniquePathNumber(file, base::FilePath::StringType());
   if (uniquifier > 0) {
     file = file.InsertBeforeExtensionASCII(
         base::StringPrintf(" (%d)", uniquifier));
   }
@@ skipping 625 matching lines @@
 
   Release();  // Balanced in Start().
 }
 
 void WebstoreInstaller::RecordInterrupt(const DownloadItem* download) const {
   UMA_HISTOGRAM_SPARSE_SLOWLY("Extensions.WebstoreDownload.InterruptReason",
                               download->GetLastReason());
 
   // Use logarithmic bin sizes up to 1 TB.
   const int kNumBuckets = 30;
-  const int64_t kMaxSizeKb = 1 << kNumBuckets;
+  const int64 kMaxSizeKb = 1 << kNumBuckets;
   UMA_HISTOGRAM_CUSTOM_COUNTS(
       "Extensions.WebstoreDownload.InterruptReceivedKBytes",
       download->GetReceivedBytes() / 1024,
       1,
       kMaxSizeKb,
       kNumBuckets);
-  int64_t total_bytes = download->GetTotalBytes();
+  int64 total_bytes = download->GetTotalBytes();
   if (total_bytes >= 0) {
     UMA_HISTOGRAM_CUSTOM_COUNTS(
         "Extensions.WebstoreDownload.InterruptTotalKBytes",
         total_bytes / 1024,
         1,
         kMaxSizeKb,
         kNumBuckets);
   }
   UMA_HISTOGRAM_BOOLEAN(
       "Extensions.WebstoreDownload.InterruptTotalSizeUnknown",
       total_bytes <= 0);
 }
 
 }  // namespace extensions