Clarify and separate the concept of "Drive path" and "Filesystem relative path".

chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc

 // Copyright 2013 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/chromeos/extensions/file_manager/private_api_drive.h"
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/logging.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/file_tasks.h"
+#include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/url_util.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/drive/drive_app_registry.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/api/file_browser_private.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/common/fileapi/file_system_info.h"
 #include "webkit/common/fileapi/file_system_util.h"
 
 using content::BrowserThread;
@@ skipping 376 matching lines @@
 
   base::ListValue* entries = new base::ListValue();
 
   // Convert Drive files to something File API stack can understand.
   fileapi::FileSystemInfo info =
       fileapi::GetFileSystemInfoForChromeOS(source_url_.GetOrigin());
   for (size_t i = 0; i < results->size(); ++i) {
     base::DictionaryValue* entry = new base::DictionaryValue();
     entry->SetString("fileSystemName", info.name);
     entry->SetString("fileSystemRoot", info.root_url.spec());
-    entry->SetString("fileFullPath", "/" + results->at(i).path.value());
+    entry->SetString("fileFullPath",
+        "/" + file_manager::util::ConvertDrivePathToRelativeFileSystemPath(
+            GetProfile(), results->at(i).path).AsUTF8Unsafe());
     entry->SetBoolean("fileIsDirectory", results->at(i).is_directory);
     entries->Append(entry);
   }
 
   base::DictionaryValue* result = new base::DictionaryValue();
   result->Set("entries", entries);
   result->SetString("nextFeed", next_link.spec());
 
   SetResult(result);
   SendResponse(true);
@@ skipping 66 matching lines @@
   // converted to a FileEntry.
   fileapi::FileSystemInfo info =
       fileapi::GetFileSystemInfoForChromeOS(source_url_.GetOrigin());
   for (size_t i = 0; i < results->size(); ++i) {
     base::DictionaryValue* result_dict = new base::DictionaryValue();
 
     // FileEntry fields.
     base::DictionaryValue* entry = new base::DictionaryValue();
     entry->SetString("fileSystemName", info.name);
     entry->SetString("fileSystemRoot", info.root_url.spec());
-    entry->SetString("fileFullPath", "/" + results->at(i).path.value());
+    entry->SetString("fileFullPath",
+        "/" + file_manager::util::ConvertDrivePathToRelativeFileSystemPath(
+            GetProfile(), results->at(i).path).AsUTF8Unsafe());
     entry->SetBoolean("fileIsDirectory",
                       results->at(i).entry.file_info().is_directory());
 
     result_dict->Set("entry", entry);
     result_dict->SetString("highlightedBaseName",
                            results->at(i).highlighted_base_name);
     results_list->Append(result_dict);
   }
 
   SetResult(results_list);
@@ skipping 97 matching lines @@
     error_ = "Share Url for this item is not available.";
     SendResponse(false);
     return;
   }
 
   SetResult(new base::StringValue(share_url.spec()));
   SendResponse(true);
 }
 
 }  // namespace extensions