Migrate fullPaths to URLs in appState.

chrome/browser/ui/views/select_file_dialog_extension.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/ui/views/select_file_dialog_extension.h"
 
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
@@ skipping 315 matching lines @@
 
   base::FilePath download_default_path(
       pref_service->GetFilePath(prefs::kDownloadDefaultDirectory));
 
   base::FilePath selection_path = default_path.IsAbsolute() ?
       default_path : download_default_path.Append(default_path.BaseName());
 
   base::FilePath fallback_path = profile_->last_selected_directory().empty() ?
       download_default_path : profile_->last_selected_directory();
 
-  // Convert the above absolute paths to virtual paths.
-  // TODO(mtomasz): Use URLs instead of paths.
-  base::FilePath selection_virtual_path;
-  if (!file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
+  // Convert the above absolute paths to file system URLs.
+  GURL selection_url;
+  if (!file_manager::util::ConvertAbsoluteFilePathToFileSystemUrl(
       profile_,
+      selection_path,
       file_manager::kFileManagerAppId,
-      selection_path,
-      &selection_virtual_path)) {
+      &selection_url)) {
     // Due to the current design, an invalid temporal cache file path may passed
     // as |default_path| (crbug.com/178013 #9-#11). In such a case, we use the
     // last selected directory as a workaround. Real fix is tracked at
     // crbug.com/110119.
-    if (!file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
+    if (!file_manager::util::ConvertAbsoluteFilePathToFileSystemUrl(
         profile_,
+        fallback_path.Append(default_path.BaseName()),
         file_manager::kFileManagerAppId,
-        fallback_path.Append(default_path.BaseName()),
-        &selection_virtual_path)) {
-      LOG(ERROR) << "Unable to resolve the selection path.";
+        &selection_url)) {
+      LOG(ERROR) << "Unable to resolve the selection URL.";
       return;
     }
   }
-  // TODO(mtomasz): Adding a leading separator works, because this code is
-  // executed on Chrome OS only. This trick will be removed, once migration to
-  // URLs is finished.
-  selection_virtual_path = base::FilePath("/").Append(selection_virtual_path);
 
-  base::FilePath current_directory_virtual_path;
+  GURL current_directory_url;
   base::FilePath current_directory_path = selection_path.DirName();
-  if (!file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
+  if (!file_manager::util::ConvertAbsoluteFilePathToFileSystemUrl(
       profile_,
+      current_directory_path,
       file_manager::kFileManagerAppId,
-      current_directory_path,
-      &current_directory_virtual_path)) {
+      &current_directory_url)) {
     // Fallback if necessary, see the comment above.
-    if (!file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
+    if (!file_manager::util::ConvertAbsoluteFilePathToFileSystemUrl(
             profile_,
+            fallback_path,
             file_manager::kFileManagerAppId,
-            fallback_path,
-            &current_directory_virtual_path)) {
-      LOG(ERROR) << "Unable to resolve the current directory path: "
+            &current_directory_url)) {
+      LOG(ERROR) << "Unable to resolve the current directory URL for: "
                  << fallback_path.value();
       return;
     }
   }
-  current_directory_virtual_path = base::FilePath("/").Append(
-      current_directory_virtual_path);
 
   has_multiple_file_type_choices_ =
       !file_types || (file_types->extensions.size() > 1);
 
   GURL file_manager_url =
       file_manager::util::GetFileManagerMainPageUrlWithParams(
           type,
           title,
-          current_directory_virtual_path,
-          selection_virtual_path,
+          current_directory_url,
+          selection_url,
+          default_path.BaseName().value(),
           file_types,
           file_type_index,
           default_extension);
 
   ExtensionDialog* dialog = ExtensionDialog::Show(file_manager_url,
       base_window, profile_, web_contents,
       kFileManagerWidth, kFileManagerHeight,
       kFileManagerMinimumWidth,
       kFileManagerMinimumHeight,
 #if defined(USE_AURA)
       file_manager::util::GetSelectFileDialogTitle(type),
 #else
       // HTML-based header used.
       base::string16(),
 #endif
       this /* ExtensionDialog::Observer */);
   if (!dialog) {
     LOG(ERROR) << "Unable to create extension dialog";
     return;
   }
 
   // Connect our listener to FileDialogFunction's per-tab callbacks.
   AddPending(routing_id);
 
   extension_dialog_ = dialog;
   params_ = params;
   routing_id_ = routing_id;
   owner_window_ = owner_window;
 }