1 files changed, 18 insertions, 30 deletions

diff --git a/chromium/content/renderer/pepper/pepper_file_chooser_host.cc b/chromium/content/renderer/pepper/pepper_file_chooser_host.cc
index ca13f5a7949..d067c201e39 100644
--- a/chromium/content/renderer/pepper/pepper_file_chooser_host.cc
+++ b/chromium/content/renderer/pepper/pepper_file_chooser_host.cc
@@ -24,9 +24,8 @@ namespace content {
 class PepperFileChooserHost::CompletionHandler
     : public blink::WebFileChooserCompletion {
  public:
-  CompletionHandler(const base::WeakPtr<PepperFileChooserHost>& host)
-      : host_(host) {
-  }
+  explicit CompletionHandler(const base::WeakPtr<PepperFileChooserHost>& host)
+      : host_(host) {}
 
   virtual ~CompletionHandler() {}
 
@@ -50,8 +49,7 @@ class PepperFileChooserHost::CompletionHandler
       std::vector<PepperFileChooserHost::ChosenFileInfo> files;
       for (size_t i = 0; i < file_names.size(); i++) {
         files.push_back(PepperFileChooserHost::ChosenFileInfo(
-            file_names[i].path.utf8(),
-            file_names[i].displayName.utf8()));
+            file_names[i].path.utf8(), file_names[i].displayName.utf8()));
       }
       host_->StoreChosenFiles(files);
     }
@@ -69,30 +67,24 @@ class PepperFileChooserHost::CompletionHandler
 PepperFileChooserHost::ChosenFileInfo::ChosenFileInfo(
     const std::string& path,
     const std::string& display_name)
-    : path(path),
-      display_name(display_name) {
-}
-
+    : path(path), display_name(display_name) {}
 
-PepperFileChooserHost::PepperFileChooserHost(
-    RendererPpapiHost* host,
-    PP_Instance instance,
-    PP_Resource resource)
+PepperFileChooserHost::PepperFileChooserHost(RendererPpapiHost* host,
+                                             PP_Instance instance,
+                                             PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       renderer_ppapi_host_(host),
       handler_(NULL),
-      weak_factory_(this) {
-}
+      weak_factory_(this) {}
 
-PepperFileChooserHost::~PepperFileChooserHost() {
-}
+PepperFileChooserHost::~PepperFileChooserHost() {}
 
 int32_t PepperFileChooserHost::OnResourceMessageReceived(
     const IPC::Message& msg,
     ppapi::host::HostMessageContext* context) {
-  IPC_BEGIN_MESSAGE_MAP(PepperFileChooserHost, msg)
+  PPAPI_BEGIN_MESSAGE_MAP(PepperFileChooserHost, msg)
     PPAPI_DISPATCH_HOST_RESOURCE_CALL(PpapiHostMsg_FileChooser_Show, OnShow)
-  IPC_END_MESSAGE_MAP()
+  PPAPI_END_MESSAGE_MAP()
   return PP_ERROR_FAILED;
 }
 
@@ -103,12 +95,12 @@ void PepperFileChooserHost::StoreChosenFiles(
   std::vector<std::string> display_names;
   for (size_t i = 0; i < files.size(); i++) {
 #if defined(OS_WIN)
-    base::FilePath file_path(UTF8ToWide(files[i].path));
+    base::FilePath file_path(base::UTF8ToWide(files[i].path));
 #else
     base::FilePath file_path(files[i].path);
 #endif
     file_paths.push_back(file_path);
-    create_msgs.push_back(PpapiHostMsg_FileRef_CreateExternal(file_path));
+    create_msgs.push_back(PpapiHostMsg_FileRef_CreateForRawFS(file_path));
     display_names.push_back(files[i].display_name);
   }
 
@@ -141,7 +133,7 @@ int32_t PepperFileChooserHost::OnShow(
 
   if (!host()->permissions().HasPermission(
           ppapi::PERMISSION_BYPASS_USER_GESTURE) &&
-       !renderer_ppapi_host_->HasUserGesture(pp_instance())) {
+      !renderer_ppapi_host_->HasUserGesture(pp_instance())) {
     return PP_ERROR_NO_USER_GESTURE;
   }
 
@@ -155,8 +147,8 @@ int32_t PepperFileChooserHost::OnShow(
   }
   std::vector<blink::WebString> mine_types(accept_mime_types.size());
   for (size_t i = 0; i < accept_mime_types.size(); i++) {
-    mine_types[i] = blink::WebString::fromUTF8(
-        accept_mime_types[i].data(), accept_mime_types[i].size());
+    mine_types[i] = blink::WebString::fromUTF8(accept_mime_types[i].data(),
+                                               accept_mime_types[i].size());
   }
   params.acceptTypes = mine_types;
   params.directory = false;
@@ -183,11 +175,8 @@ void PepperFileChooserHost::DidCreateResourceHosts(
 
   std::vector<ppapi::FileRefCreateInfo> chosen_files;
   for (size_t i = 0; i < browser_ids.size(); ++i) {
-    PepperFileRefRendererHost* renderer_host =
-        new PepperFileRefRendererHost(renderer_ppapi_host_,
-                                      pp_instance(),
-                                      0,
-                                      file_paths[i]);
+    PepperFileRefRendererHost* renderer_host = new PepperFileRefRendererHost(
+        renderer_ppapi_host_, pp_instance(), 0, file_paths[i]);
     int renderer_id =
         renderer_ppapi_host_->GetPpapiHost()->AddPendingResourceHost(
             scoped_ptr<ppapi::host::ResourceHost>(renderer_host));
@@ -204,4 +193,3 @@ void PepperFileChooserHost::DidCreateResourceHosts(
 }
 
 }  // namespace content
-