Replace usage of basictypes.h with a combination of stdint.h and base/macros.h.

components/component_updater/component_updater_service.cc

 // Copyright 2014 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 "components/component_updater/component_updater_service.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/observer_list.h"
 #include "base/sequenced_task_runner.h"
 #include "base/stl_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread_checker.h"
 #include "base/timer/timer.h"
 #include "components/component_updater/component_patcher_operation.h"
 #include "components/component_updater/component_unpacker.h"
@@ skipping 84 matching lines @@
   virtual std::vector<std::string> GetComponentIDs() const OVERRIDE;
   virtual OnDemandUpdater& GetOnDemandUpdater() OVERRIDE;
   virtual void MaybeThrottle(const std::string& crx_id,
                              const base::Closure& callback) OVERRIDE;
   virtual scoped_refptr<base::SequencedTaskRunner> GetSequencedTaskRunner()
       OVERRIDE;
 
   // Context for a crx download url request.
   struct CRXContext {
     ComponentInstaller* installer;
-    std::vector<uint8> pk_hash;
+    std::vector<uint8_t> pk_hash;
     std::string id;
     std::string fingerprint;
     CRXContext() : installer(NULL) {}
   };
 
  private:
   enum ErrorCategory {
     kErrorNone = 0,
     kNetworkError,
     kUnpackError,
@@ skipping 178 matching lines @@
   DCHECK(!update_checker_);
   CHECK(!timer_.IsRunning());
   // It could be the case that Stop() had been called while a url request
   // or unpacking was in flight, if so we arrive here but |running_| is
   // false. In that case do not loop again.
   if (!running_)
     return;
 
   // Keep the delay short if in the middle of an update (step_delay),
   // or there are new requested_work_items_ that have not been processed yet.
-  int64 delay_seconds = 0;
+  int64_t delay_seconds = 0;
   if (!HasOnDemandItems()) {
     switch (step_delay) {
       case kStepDelayShort:
         delay_seconds = config_->StepDelay();
         break;
       case kStepDelayMedium:
         delay_seconds = config_->StepDelayMedium();
         break;
       case kStepDelayLong:
         delay_seconds = config_->NextCheckDelay();
@@ skipping 680 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // The component update factory. Using the component updater as a singleton
 // is the job of the browser process.
 ComponentUpdateService* ComponentUpdateServiceFactory(Configurator* config) {
   DCHECK(config);
   return new CrxUpdateService(config);
 }
 
 }  // namespace component_updater