Normalize download file name on chromeos

chrome/browser/download/download_file_picker_chromeos.cc

 // Copyright (c) 2012 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/download/download_file_picker_chromeos.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/download_item.h"
-#include "content/public/browser/download_manager.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
 #include "chrome/browser/chromeos/gdata/gdata_system_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
+#include "chrome/browser/download/download_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/download_item.h"
+#include "content/public/browser/download_manager.h"
 
 using content::BrowserThread;
 using content::DownloadManager;
 
 namespace {
 
 // Callbacks for PostTaskAndReply.
 
 // |temp_path| is set to a temporary local download path in
 // ~/GCache/v1/tmp/downloads/
@@ skipping 27 matching lines @@
     int32 download_id)
     : DownloadFilePicker(download_manager,
                          web_contents,
                          suggested_path,
                          download_id) {
 }
 
 DownloadFilePickerChromeOS::~DownloadFilePickerChromeOS() {
 }
 
-void DownloadFilePickerChromeOS::FileSelected(const FilePath& path,
+void DownloadFilePickerChromeOS::FileSelected(const FilePath& selected_path,
                                               int index,
                                               void* params) {
+  FilePath normalized_file_name = selected_path.BaseName();
+  download_util::NormalizeFileNameOnChromeOS(&normalized_file_name);
+  FilePath path = selected_path.DirName().Append(normalized_file_name);
+
   RecordFileSelected(path);
 
   if (download_manager_) {
     gdata::GDataSystemService* system_service =
         gdata::GDataSystemServiceFactory::GetForProfile(
             ProfileManager::GetDefaultProfile());
     if (system_service && gdata::util::IsUnderGDataMountPoint(path)) {
       // If we're trying to download a file into gdata, save path in external
       // data.
       content::DownloadItem* download =
@@ skipping 17 matching lines @@
                        download_manager_,
                        base::Owned(download_path),
                        download_id_));
       }
     } else {
       download_manager_->FileSelected(path, download_id_);
     }
   }
   delete this;
 }