Reland 220012: Move the functions of filebrowserPrivateApi from the file_manager namespace to the e…

chrome/browser/chromeos/extensions/file_manager/private_api_mount.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_mount.h"
 
 #include "base/format_macros.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/logging.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 using chromeos::disks::DiskMountManager;
 using content::BrowserThread;
 
-namespace file_manager {
+namespace extensions {
 namespace {
 
 // Creates a dictionary describing the mount point of |mount_point_info|.
 base::DictionaryValue* CreateValueFromMountPoint(
     Profile* profile,
     const DiskMountManager::MountPointInfo& mount_point_info,
     const std::string& extension_id) {
 
   base::DictionaryValue *mount_info = new base::DictionaryValue();
 
   mount_info->SetString("mountType",
                         DiskMountManager::MountTypeToString(
                             mount_point_info.mount_type));
   mount_info->SetString("sourcePath", mount_point_info.source_path);
 
   base::FilePath relative_mount_path;
   // Convert mount point path to relative path with the external file system
   // exposed within File API.
-  if (util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
+  if (file_manager::util::ConvertAbsoluteFilePathToRelativeFileSystemPath(
           profile,
           extension_id,
           base::FilePath(mount_point_info.mount_path),
           &relative_mount_path)) {
     mount_info->SetString("mountPath", relative_mount_path.value());
   }
 
   mount_info->SetString("mountCondition",
                         DiskMountManager::MountConditionToString(
                             mount_point_info.mount_condition));
@@ skipping 41 matching lines @@
       DiskMountManager::MountTypeFromString(mount_type_str);
   switch (mount_type) {
     case chromeos::MOUNT_TYPE_INVALID: {
       error_ = "Invalid mount type";
       SendResponse(false);
       break;
     }
     case chromeos::MOUNT_TYPE_GOOGLE_DRIVE: {
       // Dispatch fake 'mounted' event because JS code depends on it.
       // TODO(hashimoto): Remove this redanduncy.
-      FileBrowserPrivateAPI::Get(profile_)->event_router()->
+      file_manager::FileBrowserPrivateAPI::Get(profile_)->event_router()->
           OnFileSystemMounted();
 
       // Pass back the drive mount point path as source path.
       const std::string& drive_path =
           drive::util::GetDriveMountPointPathAsString();
       SetResult(new base::StringValue(drive_path));
       SendResponse(true);
       break;
     }
     default: {
-      const base::FilePath path = util::GetLocalPathFromURL(
+      const base::FilePath path = file_manager::util::GetLocalPathFromURL(
           render_view_host(), profile(), GURL(file_url));
 
       if (path.empty()) {
         SendResponse(false);
         break;
       }
 
       const base::FilePath::StringType display_name = path.BaseName().value();
 
       // Check if the source path is under Drive cache directory.
@@ skipping 61 matching lines @@
 
   drive::util::Log(logging::LOG_INFO,
                    "%s[%d] called. (mount_path: '%s')",
                    name().c_str(),
                    request_id(),
                    mount_path.c_str());
   set_log_on_completion(true);
 
   std::vector<GURL> file_paths;
   file_paths.push_back(GURL(mount_path));
-  util::GetSelectedFileInfo(
+  file_manager::util::GetSelectedFileInfo(
       render_view_host(),
       profile(),
       file_paths,
-      util::NEED_LOCAL_PATH_FOR_OPENING,
+      file_manager::util::NEED_LOCAL_PATH_FOR_OPENING,
       base::Bind(&RemoveMountFunction::GetSelectedFileInfoResponse, this));
   return true;
 }
 
 void RemoveMountFunction::GetSelectedFileInfoResponse(
     const std::vector<ui::SelectedFileInfo>& files) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (files.size() != 1) {
     SendResponse(false);
@@ skipping 46 matching lines @@
                    "%s[%d] succeeded. (results: '%s', %" PRIuS " mount points)",
                    name().c_str(),
                    request_id(),
                    log_string.c_str(),
                    mount_points.size());
 
   SendResponse(true);
   return true;
 }
 
-}  // namespace file_manager
+}  // namespace extensions