Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / fileapi / picasa_finder.cc

diff --git a/src/chrome/browser/media_galleries/fileapi/picasa_finder.cc b/src/chrome/browser/media_galleries/fileapi/picasa_finder.cc
index 87ec630..9eed5b5 100644 (file)
--- a/src/chrome/browser/media_galleries/fileapi/picasa_finder.cc
+++ b/src/chrome/browser/media_galleries/fileapi/picasa_finder.cc
@@ -13,8 +13,8 @@
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string16.h"
-#include "chrome/browser/storage_monitor/storage_info.h"
 #include "chrome/common/media_galleries/picasa_types.h"
+#include "components/storage_monitor/storage_info.h"
 #include "content/public/browser/browser_thread.h"
 
 #if defined(OS_WIN)
@@ -39,7 +39,7 @@ base::FilePath GetCustomPicasaAppDataPathFromWinRegistry() {
     return base::FilePath();
   }
 
-  string16 value;
+  base::string16 value;
   if (key.ReadValue(kPicasaRegistryAppDataPathKey, &value) != ERROR_SUCCESS)
     return base::FilePath();
   if (value.empty())