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

chrome/browser/component_updater/widevine_cdm_component_installer.cc

 // Copyright (c) 2013 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/component_updater/widevine_cdm_component_installer.h"
 
+#include <stdint.h>
 #include <string.h>
-
 #include <string>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.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/path_service.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/widevine_cdm_constants.h"
@@ skipping 10 matching lines @@
 using content::BrowserThread;
 using content::PluginService;
 
 namespace component_updater {
 
 #if defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
 
 namespace {
 
 // CRX hash. The extension id is: oimompecagnajdejgnnjijobebaeigek.
-const uint8 kSha2Hash[] = {0xe8, 0xce, 0xcf, 0x42, 0x06, 0xd0, 0x93, 0x49,
-                           0x6d, 0xd9, 0x89, 0xe1, 0x41, 0x04, 0x86, 0x4a,
-                           0x8f, 0xbd, 0x86, 0x12, 0xb9, 0x58, 0x9b, 0xfb,
-                           0x4f, 0xbb, 0x1b, 0xa9, 0xd3, 0x85, 0x37, 0xef};
+const uint8_t kSha2Hash[] = {0xe8, 0xce, 0xcf, 0x42, 0x06, 0xd0, 0x93, 0x49,
+                             0x6d, 0xd9, 0x89, 0xe1, 0x41, 0x04, 0x86, 0x4a,
+                             0x8f, 0xbd, 0x86, 0x12, 0xb9, 0x58, 0x9b, 0xfb,
+                             0x4f, 0xbb, 0x1b, 0xa9, 0xd3, 0x85, 0x37, 0xef};
 
 // File name of the Widevine CDM component manifest on different platforms.
 const char kWidevineCdmManifestName[] = "WidevineCdm";
 
 // File name of the Widevine CDM adapter version file. The CDM adapter shares
 // the same version number with Chromium version.
 const char kCdmAdapterVersionName[] = "CdmAdapterVersion";
 
 // Name of the Widevine CDM OS in the component manifest.
 const char kWidevineCdmPlatform[] =
@@ skipping 178 matching lines @@
   virtual bool CanAutoUpdate() const OVERRIDE;
   virtual bool OnCustomInstall(const base::DictionaryValue& manifest,
                                const base::FilePath& install_dir) OVERRIDE;
   virtual bool VerifyInstallation(
       const base::FilePath& install_dir) const OVERRIDE;
   virtual void ComponentReady(
       const base::Version& version,
       const base::FilePath& path,
       scoped_ptr<base::DictionaryValue> manifest) OVERRIDE;
   virtual base::FilePath GetBaseDirectory() const OVERRIDE;
-  virtual void GetHash(std::vector<uint8>* hash) const OVERRIDE;
+  virtual void GetHash(std::vector<uint8_t>* hash) const OVERRIDE;
   virtual std::string GetName() const OVERRIDE;
 
   // Checks and updates CDM adapter if necessary to make sure the latest CDM
   // adapter is always used.
   // Note: The component is ready when CDM is present, but the CDM won't be
   // registered until the adapter is copied by this function (see
   // VerifyInstallation).
   void UpdateCdmAdapter(const base::Version& cdm_version,
                         const base::FilePath& cdm_install_dir,
                         scoped_ptr<base::DictionaryValue> manifest);
@@ skipping 41 matching lines @@
 
 // The base directory on Windows looks like:
 // <profile>\AppData\Local\Google\Chrome\User Data\WidevineCdm\.
 base::FilePath WidevineCdmComponentInstallerTraits::GetBaseDirectory() const {
   base::FilePath result;
   PathService::Get(chrome::DIR_COMPONENT_WIDEVINE_CDM, &result);
   return result;
 }
 
 void WidevineCdmComponentInstallerTraits::GetHash(
-    std::vector<uint8>* hash) const {
+    std::vector<uint8_t>* hash) const {
   hash->assign(kSha2Hash, kSha2Hash + arraysize(kSha2Hash));
 }
 
 std::string WidevineCdmComponentInstallerTraits::GetName() const {
   return kWidevineCdmManifestName;
 }
 
 void WidevineCdmComponentInstallerTraits::UpdateCdmAdapter(
     const base::Version& cdm_version,
     const base::FilePath& cdm_install_dir,
@@ skipping 47 matching lines @@
   // |cus| will take ownership of |installer| during installer->Register(cus).
   DefaultComponentInstaller* installer =
       new DefaultComponentInstaller(traits.Pass());
   installer->Register(cus);
 #else
   return;
 #endif  // defined(WIDEVINE_CDM_AVAILABLE) && defined(WIDEVINE_CDM_IS_COMPONENT)
 }
 
 }  // namespace component_updater