Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / renderer_host / pepper / device_id_fetcher.cc

diff --git a/src/chrome/browser/renderer_host/pepper/device_id_fetcher.cc b/src/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
index 51d327e..06bf449 100644 (file)
--- a/src/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
+++ b/src/chrome/browser/renderer_host/pepper/device_id_fetcher.cc
@@ -12,7 +12,7 @@
 #if defined(OS_CHROMEOS)
 #include "chromeos/cryptohome/system_salt_getter.h"
 #endif
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
@@ -162,13 +162,13 @@ void DeviceIDFetcher::ComputeOnUIThread(const std::string& salt,
   input.append(kDRMIdentifierFile);
   input.append(salt_bytes.begin(), salt_bytes.end());
   crypto::SHA256HashString(input, &id_buf, sizeof(id_buf));
-  std::string id = StringToLowerASCII(
+  std::string id = base::StringToLowerASCII(
       base::HexEncode(reinterpret_cast<const void*>(id_buf), sizeof(id_buf)));
   input = machine_id;
   input.append(kDRMIdentifierFile);
   input.append(id);
   crypto::SHA256HashString(input, &id_buf, sizeof(id_buf));
-  id = StringToLowerASCII(
+  id = base::StringToLowerASCII(
       base::HexEncode(reinterpret_cast<const void*>(id_buf), sizeof(id_buf)));
 
   RunCallbackOnIOThread(id, PP_OK);