Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / component_updater / pepper_flash_component_installer.cc

diff --git a/src/chrome/browser/component_updater/pepper_flash_component_installer.cc b/src/chrome/browser/component_updater/pepper_flash_component_installer.cc
index 70219e9..077f84c 100644 (file)
--- a/src/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/src/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include <stdint.h>
 #include <string.h>
-
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
-#include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
@@ -22,7 +22,6 @@
 #include "base/values.h"
 #include "base/version.h"
 #include "build/build_config.h"
-#include "chrome/browser/component_updater/component_updater_service.h"
 #include "chrome/browser/component_updater/flash_component_installer.h"
 #include "chrome/browser/component_updater/ppapi_utils.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
@@ -30,6 +29,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pepper_flash.h"
+#include "components/component_updater/component_updater_service.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/common/content_constants.h"
@@ -50,10 +50,10 @@ const char kPepperFlashManifestName[] = "Flapper";
 
 #if defined(GOOGLE_CHROME_BUILD) && !defined(OS_LINUX)
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
-const uint8 kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
-                           0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
-                           0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
-                           0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c};
+const uint8_t kSha2Hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
+                             0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
+                             0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
+                             0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c};
 
 // If we don't have a Pepper Flash component, this is the version we claim.
 const char kNullVersion[] = "0.0.0.0";
@@ -215,7 +215,7 @@ bool MakePepperFlashPluginInfo(const base::FilePath& flash_path,
                                content::PepperPluginInfo* plugin_info) {
   if (!flash_version.IsValid())
     return false;
-  const std::vector<uint16> ver_nums = flash_version.components();
+  const std::vector<uint16_t> ver_nums = flash_version.components();
   if (ver_nums.size() < 3)
     return false;