Rename fileBrowserPrivate to fileManagerPrivate

fileBrowserPrivate was a misnomer as the term "file manager"
is used everywhere else (ex. src/ui/file_manager).

Note that fileBrowserHandler is not renamed because it's a
public API.

TEST=git grep -E -i file.?browser.?private || echo ok
BUG=411762
R=achuith@chromium.org, asvitkine@chromium.org, benwells@chromium.org, mtomasz@chromium.org, thestig@chromium.org, yoshiki@chromium.org

Review URL: https://codereview.chromium.org/550863003

Cr-Commit-Position: refs/heads/master@{#294101}

136 files changed, 1071 insertions, 1071 deletions

diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc
index 5a68994..ffc9079 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -17,7 +17,7 @@
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/browser_thread.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
@@ -156,8 +156,8 @@ void FileTaskExecutor::Done(bool success) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (!done_.is_null())
     done_.Run(success
-                  ? extensions::api::file_browser_private::TASK_RESULT_OPENED
-                  : extensions::api::file_browser_private::TASK_RESULT_FAILED);
+                  ? extensions::api::file_manager_private::TASK_RESULT_OPENED
+                  : extensions::api::file_manager_private::TASK_RESULT_FAILED);
   delete this;
 }
 
diff --git a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
index 9537ab4..7807290 100644
--- a/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor_unittest.cc
@@ -109,13 +109,13 @@ TEST(FileTaskExecutorTest, DriveAppOpenSuccess) {
       storage::kFileSystemTypeDrive,
       base::FilePath::FromUTF8Unsafe("/special/drive/root/file2.txt")));
 
-  extensions::api::file_browser_private::TaskResult result =
-      extensions::api::file_browser_private::TASK_RESULT_NONE;
+  extensions::api::file_manager_private::TaskResult result =
+      extensions::api::file_manager_private::TASK_RESULT_NONE;
   executor->Execute(urls,
                     google_apis::test_util::CreateCopyResultCallback(&result));
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_EQ(extensions::api::file_browser_private::TASK_RESULT_OPENED, result);
+  EXPECT_EQ(extensions::api::file_manager_private::TASK_RESULT_OPENED, result);
   ASSERT_EQ(2u, opend_urls.size());
   EXPECT_TRUE(opend_urls.count("http://openlink/id1/test-app-id"));
   EXPECT_TRUE(opend_urls.count("http://openlink/id2/test-app-id"));
@@ -139,13 +139,13 @@ TEST(FileTaskExecutorTest, DriveAppOpenFailForNonExistingFile) {
       storage::kFileSystemTypeDrive,
       base::FilePath::FromUTF8Unsafe("/special/drive/root/not-exist.txt")));
 
-  extensions::api::file_browser_private::TaskResult result =
-      extensions::api::file_browser_private::TASK_RESULT_NONE;
+  extensions::api::file_manager_private::TaskResult result =
+      extensions::api::file_manager_private::TASK_RESULT_NONE;
   executor->Execute(urls,
                     google_apis::test_util::CreateCopyResultCallback(&result));
   base::RunLoop().RunUntilIdle();
 
-  EXPECT_EQ(extensions::api::file_browser_private::TASK_RESULT_FAILED, result);
+  EXPECT_EQ(extensions::api::file_manager_private::TASK_RESULT_FAILED, result);
   ASSERT_TRUE(opend_urls.empty());
 }
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
index 6a4cb4f..3202ba3 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.cc
@@ -10,7 +10,7 @@
 
 namespace file_manager {
 namespace {
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
 using content::BrowserThread;
 }  // namespace
 
@@ -58,7 +58,7 @@ void DeviceEventRouter::OnDeviceAdded(const std::string& device_path) {
   }
 
   if (IsExternalStorageDisabled()) {
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_DISABLED,
+    OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_DISABLED,
                   device_path);
     SetDeviceState(device_path, DEVICE_STATE_USUAL);
     return;
@@ -77,7 +77,7 @@ void DeviceEventRouter::OnDeviceAddedDelayed(const std::string& device_path) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (GetDeviceState(device_path) == DEVICE_SCANNED) {
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
+    OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
                   device_path);
     SetDeviceState(device_path, DEVICE_SCANNED_AND_REPORTED);
   }
@@ -86,7 +86,7 @@ void DeviceEventRouter::OnDeviceAddedDelayed(const std::string& device_path) {
 void DeviceEventRouter::OnDeviceRemoved(const std::string& device_path) {
   DCHECK(thread_checker_.CalledOnValidThread());
   SetDeviceState(device_path, DEVICE_STATE_USUAL);
-  OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_REMOVED, device_path);
+  OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_REMOVED, device_path);
 }
 
 void DeviceEventRouter::OnDiskAdded(
@@ -98,7 +98,7 @@ void DeviceEventRouter::OnDiskAdded(
     // If the disk is not being mounted, mark the device scan cancelled.
     const std::string& device_path = disk.system_path_prefix();
     if (GetDeviceState(device_path) == DEVICE_SCANNED_AND_REPORTED) {
-      OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
+      OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
                     device_path);
     }
     SetDeviceState(device_path, DEVICE_STATE_USUAL);
@@ -115,7 +115,7 @@ void DeviceEventRouter::OnDiskRemoved(
   const std::string& device_path = disk.system_path_prefix();
   if (!disk.mount_path().empty() &&
       GetDeviceState(device_path) != DEVICE_HARD_UNPLUGGED_AND_REPORTED) {
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
+    OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
                   device_path);
     SetDeviceState(device_path, DEVICE_HARD_UNPLUGGED_AND_REPORTED);
   }
@@ -140,10 +140,10 @@ void DeviceEventRouter::OnFormatStarted(const std::string& device_path,
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (success) {
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_FORMAT_START,
+    OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_FORMAT_START,
                   device_path);
   } else {
-    OnDeviceEvent(file_browser_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
+    OnDeviceEvent(file_manager_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
                   device_path);
   }
 }
@@ -152,8 +152,8 @@ void DeviceEventRouter::OnFormatCompleted(const std::string& device_path,
                                           bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
-  OnDeviceEvent(success ? file_browser_private::DEVICE_EVENT_TYPE_FORMAT_SUCCESS
-                        : file_browser_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
+  OnDeviceEvent(success ? file_manager_private::DEVICE_EVENT_TYPE_FORMAT_SUCCESS
+                        : file_manager_private::DEVICE_EVENT_TYPE_FORMAT_FAIL,
                 device_path);
 }
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
index 73f764f..2357bd1 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router.h
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/dbus/power_manager_client.h"
 
 namespace file_manager {
@@ -66,7 +66,7 @@ class DeviceEventRouter : public VolumeManagerObserver,
  protected:
   // Handles a device event containing |type| and |device_path|.
   virtual void OnDeviceEvent(
-      extensions::api::file_browser_private::DeviceEventType type,
+      extensions::api::file_manager_private::DeviceEventType type,
       const std::string& device_path) = 0;
   // Returns external storage is disabled or not.
   virtual bool IsExternalStorageDisabled() = 0;
diff --git a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
index 3f2dcef..fb40f64 100644
--- a/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/device_event_router_unittest.cc
@@ -15,13 +15,13 @@
 namespace file_manager {
 namespace {
 
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
 typedef chromeos::disks::DiskMountManager::Disk Disk;
 
 const char kTestDevicePath[] = "/device/test";
 
 struct DeviceEvent {
-  extensions::api::file_browser_private::DeviceEventType type;
+  extensions::api::file_manager_private::DeviceEventType type;
   std::string device_path;
 };
 
@@ -34,7 +34,7 @@ class DeviceEventRouterImpl : public DeviceEventRouter {
   virtual ~DeviceEventRouterImpl() {}
 
   // DeviceEventRouter overrides.
-  virtual void OnDeviceEvent(file_browser_private::DeviceEventType type,
+  virtual void OnDeviceEvent(file_manager_private::DeviceEventType type,
                              const std::string& device_path) OVERRIDE {
     DeviceEvent event;
     event.type = type;
@@ -119,7 +119,7 @@ TEST_F(DeviceEventRouterTest, AddAndRemoveDevice) {
   device_event_router->OnDiskRemoved(disk1_unmounted);
   device_event_router->OnDeviceRemoved("/device/test");
   ASSERT_EQ(1u, device_event_router->events.size());
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
             device_event_router->events[0].type);
   EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
 }
@@ -138,10 +138,10 @@ TEST_F(DeviceEventRouterTest, DeviceScan) {
   device_event_router->OnDiskRemoved(disk_unmounted);
   device_event_router->OnDeviceRemoved("/device/test");
   ASSERT_EQ(2u, device_event_router->events.size());
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
             device_event_router->events[0].type);
   EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
             device_event_router->events[1].type);
   EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
 }
@@ -157,13 +157,13 @@ TEST_F(DeviceEventRouterTest, DeviceScanCancelled) {
   device_event_router->OnDiskRemoved(disk_unmounted);
   device_event_router->OnDeviceRemoved("/device/test");
   ASSERT_EQ(3u, device_event_router->events.size());
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_STARTED,
             device_event_router->events[0].type);
   EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_SCAN_CANCELLED,
             device_event_router->events[1].type);
   EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
             device_event_router->events[2].type);
   EXPECT_EQ("/device/test", device_event_router->events[2].device_path);
 }
@@ -179,10 +179,10 @@ TEST_F(DeviceEventRouterTest, HardUnplugged) {
   device_event_router->OnDeviceRemoved(kTestDevicePath);
   base::RunLoop().RunUntilIdle();
   ASSERT_EQ(2u, device_event_router->events.size());
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_HARD_UNPLUGGED,
             device_event_router->events[0].type);
   EXPECT_EQ("/device/test", device_event_router->events[0].device_path);
-  EXPECT_EQ(file_browser_private::DEVICE_EVENT_TYPE_REMOVED,
+  EXPECT_EQ(file_manager_private::DEVICE_EVENT_TYPE_REMOVED,
             device_event_router->events[1].type);
   EXPECT_EQ("/device/test", device_event_router->events[1].device_path);
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.cc b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
index 6330137..951cb73 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.cc
@@ -56,7 +56,7 @@ using drive::DriveIntegrationServiceFactory;
 using file_manager::util::EntryDefinition;
 using file_manager::util::FileDefinition;
 
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
 
 namespace file_manager {
 namespace {
@@ -100,18 +100,18 @@ void JobInfoToTransferStatus(
     const std::string& extension_id,
     const std::string& job_status,
     const drive::JobInfo& job_info,
-    file_browser_private::FileTransferStatus* status) {
+    file_manager_private::FileTransferStatus* status) {
   DCHECK(IsActiveFileTransferJobInfo(job_info));
 
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
   GURL url = util::ConvertDrivePathToFileSystemUrl(
       profile, job_info.file_path, extension_id);
   status->file_url = url.spec();
-  status->transfer_state = file_browser_private::ParseTransferState(job_status);
+  status->transfer_state = file_manager_private::ParseTransferState(job_status);
   status->transfer_type =
       IsUploadJob(job_info.job_type) ?
-      file_browser_private::TRANSFER_TYPE_UPLOAD :
-      file_browser_private::TRANSFER_TYPE_DOWNLOAD;
+      file_manager_private::TRANSFER_TYPE_UPLOAD :
+      file_manager_private::TRANSFER_TYPE_DOWNLOAD;
   DriveIntegrationService* const integration_service =
       DriveIntegrationServiceFactory::FindForProfile(profile);
   status->num_total_jobs = CountActiveFileTransferJobInfo(
@@ -155,93 +155,93 @@ void BroadcastEvent(Profile* profile,
       make_scoped_ptr(new extensions::Event(event_name, event_args.Pass())));
 }
 
-file_browser_private::MountCompletedStatus
+file_manager_private::MountCompletedStatus
 MountErrorToMountCompletedStatus(chromeos::MountError error) {
   switch (error) {
     case chromeos::MOUNT_ERROR_NONE:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_SUCCESS;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_SUCCESS;
     case chromeos::MOUNT_ERROR_UNKNOWN:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN;
     case chromeos::MOUNT_ERROR_INTERNAL:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INTERNAL;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INTERNAL;
     case chromeos::MOUNT_ERROR_INVALID_ARGUMENT:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARGUMENT;
     case chromeos::MOUNT_ERROR_INVALID_PATH:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_PATH;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_PATH;
     case chromeos::MOUNT_ERROR_PATH_ALREADY_MOUNTED:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_PATH_ALREADY_MOUNTED;
     case chromeos::MOUNT_ERROR_PATH_NOT_MOUNTED:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_PATH_NOT_MOUNTED;
     case chromeos::MOUNT_ERROR_DIRECTORY_CREATION_FAILED:
-      return file_browser_private
+      return file_manager_private
           ::MOUNT_COMPLETED_STATUS_ERROR_DIRECTORY_CREATION_FAILED;
     case chromeos::MOUNT_ERROR_INVALID_MOUNT_OPTIONS:
-      return file_browser_private
+      return file_manager_private
           ::MOUNT_COMPLETED_STATUS_ERROR_INVALID_MOUNT_OPTIONS;
     case chromeos::MOUNT_ERROR_INVALID_UNMOUNT_OPTIONS:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_INVALID_UNMOUNT_OPTIONS;
     case chromeos::MOUNT_ERROR_INSUFFICIENT_PERMISSIONS:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_INSUFFICIENT_PERMISSIONS;
     case chromeos::MOUNT_ERROR_MOUNT_PROGRAM_NOT_FOUND:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_MOUNT_PROGRAM_NOT_FOUND;
     case chromeos::MOUNT_ERROR_MOUNT_PROGRAM_FAILED:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_MOUNT_PROGRAM_FAILED;
     case chromeos::MOUNT_ERROR_INVALID_DEVICE_PATH:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_INVALID_DEVICE_PATH;
     case chromeos::MOUNT_ERROR_UNKNOWN_FILESYSTEM:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_UNKNOWN_FILESYSTEM;
     case chromeos::MOUNT_ERROR_UNSUPPORTED_FILESYSTEM:
-      return file_browser_private::
+      return file_manager_private::
           MOUNT_COMPLETED_STATUS_ERROR_UNSUPPORTED_FILESYSTEM;
     case chromeos::MOUNT_ERROR_INVALID_ARCHIVE:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARCHIVE;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_INVALID_ARCHIVE;
     case chromeos::MOUNT_ERROR_NOT_AUTHENTICATED:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_AUTHENTICATION;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_AUTHENTICATION;
     case chromeos::MOUNT_ERROR_PATH_UNMOUNTED:
-      return file_browser_private::MOUNT_COMPLETED_STATUS_ERROR_PATH_UNMOUNTED;
+      return file_manager_private::MOUNT_COMPLETED_STATUS_ERROR_PATH_UNMOUNTED;
   }
   NOTREACHED();
-  return file_browser_private::MOUNT_COMPLETED_STATUS_NONE;
+  return file_manager_private::MOUNT_COMPLETED_STATUS_NONE;
 }
 
-file_browser_private::CopyProgressStatusType
+file_manager_private::CopyProgressStatusType
 CopyProgressTypeToCopyProgressStatusType(
     storage::FileSystemOperation::CopyProgressType type) {
   switch (type) {
     case storage::FileSystemOperation::BEGIN_COPY_ENTRY:
-      return file_browser_private::COPY_PROGRESS_STATUS_TYPE_BEGIN_COPY_ENTRY;
+      return file_manager_private::COPY_PROGRESS_STATUS_TYPE_BEGIN_COPY_ENTRY;
     case storage::FileSystemOperation::END_COPY_ENTRY:
-      return file_browser_private::COPY_PROGRESS_STATUS_TYPE_END_COPY_ENTRY;
+      return file_manager_private::COPY_PROGRESS_STATUS_TYPE_END_COPY_ENTRY;
     case storage::FileSystemOperation::PROGRESS:
-      return file_browser_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
+      return file_manager_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
   }
   NOTREACHED();
-  return file_browser_private::COPY_PROGRESS_STATUS_TYPE_NONE;
+  return file_manager_private::COPY_PROGRESS_STATUS_TYPE_NONE;
 }
 
-file_browser_private::ChangeType ConvertChangeTypeFromDriveToApi(
+file_manager_private::ChangeType ConvertChangeTypeFromDriveToApi(
     drive::FileChange::ChangeType type) {
   switch (type) {
     case drive::FileChange::ADD_OR_UPDATE:
-      return file_browser_private::CHANGE_TYPE_ADD_OR_UPDATE;
+      return file_manager_private::CHANGE_TYPE_ADD_OR_UPDATE;
     case drive::FileChange::DELETE:
-      return file_browser_private::CHANGE_TYPE_DELETE;
+      return file_manager_private::CHANGE_TYPE_DELETE;
   }
   NOTREACHED();
-  return file_browser_private::CHANGE_TYPE_ADD_OR_UPDATE;
+  return file_manager_private::CHANGE_TYPE_ADD_OR_UPDATE;
 }
 
 std::string FileErrorToErrorName(base::File::Error error_code) {
-  namespace js = extensions::api::file_browser_private;
+  namespace js = extensions::api::file_manager_private;
   switch (error_code) {
     case base::File::FILE_ERROR_NOT_FOUND:
       return "NotFoundError";
@@ -329,17 +329,17 @@ class DeviceEventRouterImpl : public DeviceEventRouter {
   explicit DeviceEventRouterImpl(Profile* profile) : profile_(profile) {}
 
   // DeviceEventRouter overrides.
-  virtual void OnDeviceEvent(file_browser_private::DeviceEventType type,
+  virtual void OnDeviceEvent(file_manager_private::DeviceEventType type,
                              const std::string& device_path) OVERRIDE {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-    file_browser_private::DeviceEvent event;
+    file_manager_private::DeviceEvent event;
     event.type = type;
     event.device_path = device_path;
 
     BroadcastEvent(profile_,
-                   file_browser_private::OnDeviceChanged::kEventName,
-                   file_browser_private::OnDeviceChanged::Create(event));
+                   file_manager_private::OnDeviceChanged::kEventName,
+                   file_manager_private::OnDeviceChanged::Create(event));
   }
 
   // DeviceEventRouter overrides.
@@ -537,22 +537,22 @@ void EventRouter::OnCopyCompleted(int copy_id,
                                   base::File::Error error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  file_browser_private::CopyProgressStatus status;
+  file_manager_private::CopyProgressStatus status;
   if (error == base::File::FILE_OK) {
     // Send success event.
-    status.type = file_browser_private::COPY_PROGRESS_STATUS_TYPE_SUCCESS;
+    status.type = file_manager_private::COPY_PROGRESS_STATUS_TYPE_SUCCESS;
     status.source_url.reset(new std::string(source_url.spec()));
     status.destination_url.reset(new std::string(destination_url.spec()));
   } else {
     // Send error event.
-    status.type = file_browser_private::COPY_PROGRESS_STATUS_TYPE_ERROR;
+    status.type = file_manager_private::COPY_PROGRESS_STATUS_TYPE_ERROR;
     status.error.reset(new std::string(FileErrorToErrorName(error)));
   }
 
   BroadcastEvent(
       profile_,
-      file_browser_private::OnCopyProgress::kEventName,
-      file_browser_private::OnCopyProgress::Create(copy_id, status));
+      file_manager_private::OnCopyProgress::kEventName,
+      file_manager_private::OnCopyProgress::Create(copy_id, status));
 }
 
 void EventRouter::OnCopyProgress(
@@ -563,7 +563,7 @@ void EventRouter::OnCopyProgress(
     int64 size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  file_browser_private::CopyProgressStatus status;
+  file_manager_private::CopyProgressStatus status;
   status.type = CopyProgressTypeToCopyProgressStatusType(type);
   status.source_url.reset(new std::string(source_url.spec()));
   if (type == storage::FileSystemOperation::END_COPY_ENTRY)
@@ -573,14 +573,14 @@ void EventRouter::OnCopyProgress(
 
   // Should not skip events other than TYPE_PROGRESS.
   const bool always =
-      status.type != file_browser_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
+      status.type != file_manager_private::COPY_PROGRESS_STATUS_TYPE_PROGRESS;
   if (!ShouldSendProgressEvent(always, &last_copy_progress_event_))
     return;
 
   BroadcastEvent(
       profile_,
-      file_browser_private::OnCopyProgress::kEventName,
-      file_browser_private::OnCopyProgress::Create(copy_id, status));
+      file_manager_private::OnCopyProgress::kEventName,
+      file_manager_private::OnCopyProgress::Create(copy_id, status));
 }
 
 void EventRouter::DefaultNetworkChanged(const chromeos::NetworkState* network) {
@@ -591,8 +591,8 @@ void EventRouter::DefaultNetworkChanged(const chromeos::NetworkState* network) {
 
   BroadcastEvent(
       profile_,
-      file_browser_private::OnDriveConnectionStatusChanged::kEventName,
-      file_browser_private::OnDriveConnectionStatusChanged::Create());
+      file_manager_private::OnDriveConnectionStatusChanged::kEventName,
+      file_manager_private::OnDriveConnectionStatusChanged::Create());
 }
 
 void EventRouter::OnFileManagerPrefsChanged() {
@@ -603,8 +603,8 @@ void EventRouter::OnFileManagerPrefsChanged() {
 
   BroadcastEvent(
       profile_,
-      file_browser_private::OnPreferencesChanged::kEventName,
-      file_browser_private::OnPreferencesChanged::Create());
+      file_manager_private::OnPreferencesChanged::kEventName,
+      file_manager_private::OnPreferencesChanged::Create());
 }
 
 void EventRouter::OnJobAdded(const drive::JobInfo& job_info) {
@@ -671,7 +671,7 @@ void EventRouter::SendDriveFileTransferEvent() {
   if (!drive_job_info_for_scheduled_event_)
     return;
 
-  file_browser_private::FileTransferStatus status;
+  file_manager_private::FileTransferStatus status;
   JobInfoToTransferStatus(profile_,
                           kFileManagerAppId,
                           drive_job_info_for_scheduled_event_->status,
@@ -681,8 +681,8 @@ void EventRouter::SendDriveFileTransferEvent() {
   drive_job_info_for_scheduled_event_.reset();
 
   BroadcastEvent(profile_,
-                 file_browser_private::OnFileTransfersUpdated::kEventName,
-                 file_browser_private::OnFileTransfersUpdated::Create(status));
+                 file_manager_private::OnFileTransfersUpdated::kEventName,
+                 file_manager_private::OnFileTransfersUpdated::Create(status));
 }
 
 void EventRouter::OnDirectoryChanged(const base::FilePath& drive_path) {
@@ -708,27 +708,27 @@ void EventRouter::OnFileChanged(const drive::FileChange& changed_files) {
 
 void EventRouter::OnDriveSyncError(drive::file_system::DriveSyncErrorType type,
                                    const base::FilePath& drive_path) {
-  file_browser_private::DriveSyncErrorEvent event;
+  file_manager_private::DriveSyncErrorEvent event;
   switch (type) {
     case drive::file_system::DRIVE_SYNC_ERROR_DELETE_WITHOUT_PERMISSION:
       event.type =
-          file_browser_private::DRIVE_SYNC_ERROR_TYPE_DELETE_WITHOUT_PERMISSION;
+          file_manager_private::DRIVE_SYNC_ERROR_TYPE_DELETE_WITHOUT_PERMISSION;
       break;
     case drive::file_system::DRIVE_SYNC_ERROR_SERVICE_UNAVAILABLE:
       event.type =
-          file_browser_private::DRIVE_SYNC_ERROR_TYPE_SERVICE_UNAVAILABLE;
+          file_manager_private::DRIVE_SYNC_ERROR_TYPE_SERVICE_UNAVAILABLE;
       break;
     case drive::file_system::DRIVE_SYNC_ERROR_MISC:
       event.type =
-          file_browser_private::DRIVE_SYNC_ERROR_TYPE_MISC;
+          file_manager_private::DRIVE_SYNC_ERROR_TYPE_MISC;
       break;
   }
   event.file_url = util::ConvertDrivePathToFileSystemUrl(
       profile_, drive_path, kFileManagerAppId).spec();
   BroadcastEvent(
       profile_,
-      file_browser_private::OnDriveSyncError::kEventName,
-      file_browser_private::OnDriveSyncError::Create(event));
+      file_manager_private::OnDriveSyncError::kEventName,
+      file_manager_private::OnDriveSyncError::Create(event));
 }
 
 void EventRouter::OnRefreshTokenInvalid() {
@@ -737,8 +737,8 @@ void EventRouter::OnRefreshTokenInvalid() {
   // Raise a DriveConnectionStatusChanged event to notify the status offline.
   BroadcastEvent(
       profile_,
-      file_browser_private::OnDriveConnectionStatusChanged::kEventName,
-      file_browser_private::OnDriveConnectionStatusChanged::Create());
+      file_manager_private::OnDriveConnectionStatusChanged::kEventName,
+      file_manager_private::OnDriveConnectionStatusChanged::Create());
 }
 
 void EventRouter::HandleFileWatchNotification(const drive::FileChange* list,
@@ -812,15 +812,15 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
     return;
   }
 
-  file_browser_private::FileWatchEvent event;
+  file_manager_private::FileWatchEvent event;
   event.event_type = watcher_error
-      ? file_browser_private::FILE_WATCH_EVENT_TYPE_ERROR
-      : file_browser_private::FILE_WATCH_EVENT_TYPE_CHANGED;
+      ? file_manager_private::FILE_WATCH_EVENT_TYPE_ERROR
+      : file_manager_private::FILE_WATCH_EVENT_TYPE_CHANGED;
 
   // Detailed information is available.
   if (list.get()) {
     event.changed_files.reset(
-        new std::vector<linked_ptr<file_browser_private::FileChange> >);
+        new std::vector<linked_ptr<file_manager_private::FileChange> >);
 
     if (list->map().empty())
       return;
@@ -828,8 +828,8 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
     for (drive::FileChange::Map::const_iterator it = list->map().begin();
          it != list->map().end();
          it++) {
-      linked_ptr<file_browser_private::FileChange> change_list(
-          new file_browser_private::FileChange);
+      linked_ptr<file_manager_private::FileChange> change_list(
+          new file_manager_private::FileChange);
 
       GURL url = util::ConvertDrivePathToFileSystemUrl(
           profile_, it->first, *extension_id);
@@ -857,8 +857,8 @@ void EventRouter::DispatchDirectoryChangeEventWithEntryDefinition(
                                                entry_definition.is_directory);
 
   BroadcastEvent(profile_,
-                 file_browser_private::OnDirectoryChanged::kEventName,
-                 file_browser_private::OnDirectoryChanged::Create(event));
+                 file_manager_private::OnDirectoryChanged::kEventName,
+                 file_manager_private::OnDirectoryChanged::Create(event));
 }
 
 void EventRouter::OnDiskAdded(
@@ -893,7 +893,7 @@ void EventRouter::OnVolumeMounted(chromeos::MountError error_code,
     return;
 
   DispatchMountCompletedEvent(
-      file_browser_private::MOUNT_COMPLETED_EVENT_TYPE_MOUNT,
+      file_manager_private::MOUNT_COMPLETED_EVENT_TYPE_MOUNT,
       error_code,
       volume_info);
 }
@@ -902,17 +902,17 @@ void EventRouter::OnVolumeUnmounted(chromeos::MountError error_code,
                                     const VolumeInfo& volume_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DispatchMountCompletedEvent(
-      file_browser_private::MOUNT_COMPLETED_EVENT_TYPE_UNMOUNT,
+      file_manager_private::MOUNT_COMPLETED_EVENT_TYPE_UNMOUNT,
       error_code,
       volume_info);
 }
 
 void EventRouter::DispatchMountCompletedEvent(
-    file_browser_private::MountCompletedEventType event_type,
+    file_manager_private::MountCompletedEventType event_type,
     chromeos::MountError error,
     const VolumeInfo& volume_info) {
   // Build an event object.
-  file_browser_private::MountCompletedEvent event;
+  file_manager_private::MountCompletedEvent event;
   event.event_type = event_type;
   event.status = MountErrorToMountCompletedStatus(error);
   util::VolumeInfoToVolumeMetadata(
@@ -920,8 +920,8 @@ void EventRouter::DispatchMountCompletedEvent(
   event.should_notify = ShouldShowNotificationForVolume(
       profile_, *device_event_router_, volume_info);
   BroadcastEvent(profile_,
-                 file_browser_private::OnMountCompleted::kEventName,
-                 file_browser_private::OnMountCompleted::Create(event));
+                 file_manager_private::OnMountCompleted::kEventName,
+                 file_manager_private::OnMountCompleted::Create(event));
 }
 
 void EventRouter::OnFormatStarted(const std::string& device_path,
diff --git a/chrome/browser/chromeos/extensions/file_manager/event_router.h b/chrome/browser/chromeos/extensions/file_manager/event_router.h
index 9e4fe67..1e7c342 100644
--- a/chrome/browser/chromeos/extensions/file_manager/event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/event_router.h
@@ -21,7 +21,7 @@
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_observer.h"
 #include "chrome/browser/drive/drive_service_interface.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "chromeos/network/network_state_handler_observer.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
@@ -154,7 +154,7 @@ class EventRouter : public chromeos::NetworkStateHandlerObserver,
 
   // Dispatches the mount completed event.
   void DispatchMountCompletedEvent(
-      extensions::api::file_browser_private::MountCompletedEventType event_type,
+      extensions::api::file_manager_private::MountCompletedEventType event_type,
       chromeos::MountError error,
       const VolumeInfo& volume_info);
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
deleted file mode 100644
index e6f4b40..0000000
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-// 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/chromeos/extensions/file_manager/file_browser_private_api.h"
-
-#include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
-
-namespace file_manager {
-
-FileBrowserPrivateAPI::FileBrowserPrivateAPI(Profile* profile)
-    : event_router_(new EventRouter(profile)) {
-  event_router_->ObserveEvents();
-}
-
-FileBrowserPrivateAPI::~FileBrowserPrivateAPI() {
-}
-
-void FileBrowserPrivateAPI::Shutdown() {
-  event_router_->Shutdown();
-}
-
-// static
-FileBrowserPrivateAPI* FileBrowserPrivateAPI::Get(Profile* profile) {
-  return FileBrowserPrivateAPIFactory::GetForProfile(profile);
-}
-
-}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.cc
new file mode 100644
index 0000000..5ba841f
--- /dev/null
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.cc
@@ -0,0 +1,29 @@
+// 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/chromeos/extensions/file_manager/file_manager_private_api.h"
+
+#include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
+
+namespace file_manager {
+
+FileManagerPrivateAPI::FileManagerPrivateAPI(Profile* profile)
+    : event_router_(new EventRouter(profile)) {
+  event_router_->ObserveEvents();
+}
+
+FileManagerPrivateAPI::~FileManagerPrivateAPI() {
+}
+
+void FileManagerPrivateAPI::Shutdown() {
+  event_router_->Shutdown();
+}
+
+// static
+FileManagerPrivateAPI* FileManagerPrivateAPI::Get(Profile* profile) {
+  return FileManagerPrivateAPIFactory::GetForProfile(profile);
+}
+
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h
index 2c9eff3..b0506e4 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "components/keyed_service/core/keyed_service.h"
@@ -14,17 +14,17 @@ namespace file_manager {
 
 class EventRouter;
 
-// Manages and registers the fileBrowserPrivate API with the extension system.
-class FileBrowserPrivateAPI : public KeyedService {
+// Manages and registers the fileManagerPrivate API with the extension system.
+class FileManagerPrivateAPI : public KeyedService {
  public:
-  explicit FileBrowserPrivateAPI(Profile* profile);
-  virtual ~FileBrowserPrivateAPI();
+  explicit FileManagerPrivateAPI(Profile* profile);
+  virtual ~FileManagerPrivateAPI();
 
   // KeyedService overrides.
   virtual void Shutdown() OVERRIDE;
 
-  // Convenience function to return the FileBrowserPrivateAPI for a Profile.
-  static FileBrowserPrivateAPI* Get(Profile* profile);
+  // Convenience function to return the FileManagerPrivateAPI for a Profile.
+  static FileManagerPrivateAPI* Get(Profile* profile);
 
   EventRouter* event_router() { return event_router_.get(); }
 
@@ -34,4 +34,4 @@ class FileBrowserPrivateAPI : public KeyedService {
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.cc
index 3f1b5e1..d2655fe 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.cc
@@ -2,10 +2,10 @@
 // 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/file_browser_private_api_factory.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager_factory.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
@@ -16,21 +16,21 @@
 namespace file_manager {
 
 // static
-FileBrowserPrivateAPI*
-FileBrowserPrivateAPIFactory::GetForProfile(Profile* profile) {
-  return static_cast<FileBrowserPrivateAPI*>(
+FileManagerPrivateAPI*
+FileManagerPrivateAPIFactory::GetForProfile(Profile* profile) {
+  return static_cast<FileManagerPrivateAPI*>(
       GetInstance()->GetServiceForBrowserContext(profile, true));
 }
 
 // static
-FileBrowserPrivateAPIFactory*
-FileBrowserPrivateAPIFactory::GetInstance() {
-  return Singleton<FileBrowserPrivateAPIFactory>::get();
+FileManagerPrivateAPIFactory*
+FileManagerPrivateAPIFactory::GetInstance() {
+  return Singleton<FileManagerPrivateAPIFactory>::get();
 }
 
-FileBrowserPrivateAPIFactory::FileBrowserPrivateAPIFactory()
+FileManagerPrivateAPIFactory::FileManagerPrivateAPIFactory()
     : BrowserContextKeyedServiceFactory(
-          "FileBrowserPrivateAPI",
+          "FileManagerPrivateAPI",
           BrowserContextDependencyManager::GetInstance()) {
   DependsOn(drive::DriveIntegrationServiceFactory::GetInstance());
   DependsOn(
@@ -38,25 +38,25 @@ FileBrowserPrivateAPIFactory::FileBrowserPrivateAPIFactory()
   DependsOn(VolumeManagerFactory::GetInstance());
 }
 
-FileBrowserPrivateAPIFactory::~FileBrowserPrivateAPIFactory() {
+FileManagerPrivateAPIFactory::~FileManagerPrivateAPIFactory() {
 }
 
-KeyedService* FileBrowserPrivateAPIFactory::BuildServiceInstanceFor(
+KeyedService* FileManagerPrivateAPIFactory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
-  return new FileBrowserPrivateAPI(Profile::FromBrowserContext(context));
+  return new FileManagerPrivateAPI(Profile::FromBrowserContext(context));
 }
 
-content::BrowserContext* FileBrowserPrivateAPIFactory::GetBrowserContextToUse(
+content::BrowserContext* FileManagerPrivateAPIFactory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   // Explicitly and always allow this router in guest login mode.
   return chrome::GetBrowserContextOwnInstanceInIncognito(context);
 }
 
-bool FileBrowserPrivateAPIFactory::ServiceIsCreatedWithBrowserContext() const {
+bool FileManagerPrivateAPIFactory::ServiceIsCreatedWithBrowserContext() const {
   return true;
 }
 
-bool FileBrowserPrivateAPIFactory::ServiceIsNULLWhileTesting() const {
+bool FileManagerPrivateAPIFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h
index a2e841f..85e97d0 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
 
 #include "base/memory/singleton.h"
 #include "components/keyed_service/content/browser_context_keyed_service_factory.h"
@@ -12,16 +12,16 @@ class Profile;
 
 namespace file_manager {
 
-class FileBrowserPrivateAPI;
+class FileManagerPrivateAPI;
 
-class FileBrowserPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
+class FileManagerPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
  public:
-  // Returns the FileBrowserPrivateAPI for |profile|, creating it if
+  // Returns the FileManagerPrivateAPI for |profile|, creating it if
   // it is not yet created.
-  static FileBrowserPrivateAPI* GetForProfile(Profile* profile);
+  static FileManagerPrivateAPI* GetForProfile(Profile* profile);
 
-  // Returns the FileBrowserPrivateAPIFactory instance.
-  static FileBrowserPrivateAPIFactory* GetInstance();
+  // Returns the FileManagerPrivateAPIFactory instance.
+  static FileManagerPrivateAPIFactory* GetInstance();
 
  protected:
   // BrowserContextKeyedBaseFactory overrides:
@@ -31,10 +31,10 @@ class FileBrowserPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
   virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
 
  private:
-  friend struct DefaultSingletonTraits<FileBrowserPrivateAPIFactory>;
+  friend struct DefaultSingletonTraits<FileManagerPrivateAPIFactory>;
 
-  FileBrowserPrivateAPIFactory();
-  virtual ~FileBrowserPrivateAPIFactory();
+  FileManagerPrivateAPIFactory();
+  virtual ~FileManagerPrivateAPIFactory();
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
@@ -43,4 +43,4 @@ class FileBrowserPrivateAPIFactory : public BrowserContextKeyedServiceFactory {
 
 }  // namespace file_manager
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FACTORY_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FACTORY_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h
index 83982cc8..6e278a2 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FUNCTIONS_H_
-#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FUNCTIONS_H_
+#ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FUNCTIONS_H_
+#define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FUNCTIONS_H_
 
 // This header file is included from the auto generated code by the extension
 // API scheme compiler.
-// See also chrome/common/extensions/api/file_browser_private.idl.
+// See also chrome/common/extensions/api/file_manager_private.idl.
 
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_drive.h"
@@ -17,4 +17,4 @@
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_strings.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h"
 
-#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_BROWSER_PRIVATE_API_FUNCTIONS_H_
+#endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_PRIVATE_API_FUNCTIONS_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
index 41c56ca..d3a1653 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc
@@ -108,14 +108,14 @@ TestDiskInfo kTestDisks[] = {
 
 }  // namespace
 
-class FileBrowserPrivateApiTest : public ExtensionApiTest {
+class FileManagerPrivateApiTest : public ExtensionApiTest {
  public:
-  FileBrowserPrivateApiTest()
+  FileManagerPrivateApiTest()
       : disk_mount_manager_mock_(NULL) {
     InitMountPoints();
   }
 
-  virtual ~FileBrowserPrivateApiTest() {
+  virtual ~FileManagerPrivateApiTest() {
     DCHECK(!disk_mount_manager_mock_);
     STLDeleteValues(&volumes_);
   }
@@ -131,7 +131,7 @@ class FileBrowserPrivateApiTest : public ExtensionApiTest {
 
     // OVERRIDE mock functions.
     ON_CALL(*disk_mount_manager_mock_, FindDiskBySourcePath(_)).WillByDefault(
-        Invoke(this, &FileBrowserPrivateApiTest::FindVolumeBySourcePath));
+        Invoke(this, &FileManagerPrivateApiTest::FindVolumeBySourcePath));
     EXPECT_CALL(*disk_mount_manager_mock_, disks())
         .WillRepeatedly(ReturnRef(volumes_));
     EXPECT_CALL(*disk_mount_manager_mock_, mount_points())
@@ -241,11 +241,11 @@ class FileBrowserPrivateApiTest : public ExtensionApiTest {
   DiskMountManager::MountPointMap mount_points_;
 };
 
-IN_PROC_BROWSER_TEST_F(FileBrowserPrivateApiTest, Mount) {
+IN_PROC_BROWSER_TEST_F(FileManagerPrivateApiTest, Mount) {
   file_manager::test_util::WaitUntilDriveMountPointIsAdded(
       browser()->profile());
 
-  // We will call fileBrowserPrivate.unmountVolume once. To test that method, we
+  // We will call fileManagerPrivate.unmountVolume once. To test that method, we
   // check that UnmountPath is really called with the same value.
   EXPECT_CALL(*disk_mount_manager_mock_, UnmountPath(_, _, _))
       .Times(0);
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_base.h b/chrome/browser/chromeos/extensions/file_manager/private_api_base.h
index 621e121..d2e47c3 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_base.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_base.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// This file contains base classes for fileBrowserPrivate API.
+// This file contains base classes for fileManagerPrivate API.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_BASE_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_BASE_H_
@@ -14,7 +14,7 @@ namespace extensions {
 
 // This class adds a logging feature to AsyncExtensionFunction. Logging is
 // done when sending the response to JavaScript, using drive::util::Log().
-// Async API functions of fileBrowserPrivate should inherit this class.
+// Async API functions of fileManagerPrivate should inherit this class.
 //
 // By default, logging is turned off, hence sub classes should call
 // set_log_on_completion(true) to enable it, if they want. However, even if
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
index 375a7bd..9c105ec 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/ui/views/select_file_dialog_extension.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
@@ -25,15 +25,15 @@ SelectFileDialogExtension::RoutingID GetFileDialogRoutingID(
 
 }  // namespace
 
-bool FileBrowserPrivateCancelDialogFunction::RunAsync() {
+bool FileManagerPrivateCancelDialogFunction::RunAsync() {
   SelectFileDialogExtension::OnFileSelectionCanceled(
       GetFileDialogRoutingID(this));
   SendResponse(true);
   return true;
 }
 
-bool FileBrowserPrivateSelectFileFunction::RunAsync() {
-  using extensions::api::file_browser_private::SelectFile::Params;
+bool FileManagerPrivateSelectFileFunction::RunAsync() {
+  using extensions::api::file_manager_private::SelectFile::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -54,13 +54,13 @@ bool FileBrowserPrivateSelectFileFunction::RunAsync() {
       file_paths,
       option,
       base::Bind(
-          &FileBrowserPrivateSelectFileFunction::GetSelectedFileInfoResponse,
+          &FileManagerPrivateSelectFileFunction::GetSelectedFileInfoResponse,
           this,
           params->index));
   return true;
 }
 
-void FileBrowserPrivateSelectFileFunction::GetSelectedFileInfoResponse(
+void FileManagerPrivateSelectFileFunction::GetSelectedFileInfoResponse(
     int index,
     const std::vector<ui::SelectedFileInfo>& files) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -73,8 +73,8 @@ void FileBrowserPrivateSelectFileFunction::GetSelectedFileInfoResponse(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateSelectFilesFunction::RunAsync() {
-  using extensions::api::file_browser_private::SelectFiles::Params;
+bool FileManagerPrivateSelectFilesFunction::RunAsync() {
+  using extensions::api::file_manager_private::SelectFiles::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -90,12 +90,12 @@ bool FileBrowserPrivateSelectFilesFunction::RunAsync() {
           file_manager::util::NEED_LOCAL_PATH_FOR_OPENING :
           file_manager::util::NO_LOCAL_PATH_RESOLUTION,
       base::Bind(
-          &FileBrowserPrivateSelectFilesFunction::GetSelectedFileInfoResponse,
+          &FileManagerPrivateSelectFilesFunction::GetSelectedFileInfoResponse,
           this));
   return true;
 }
 
-void FileBrowserPrivateSelectFilesFunction::GetSelectedFileInfoResponse(
+void FileManagerPrivateSelectFilesFunction::GetSelectedFileInfoResponse(
     const std::vector<ui::SelectedFileInfo>& files) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   SelectFileDialogExtension::OnMultiFilesSelected(GetFileDialogRoutingID(this),
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h
index c333a15..b06ec2c 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_dialog.h
@@ -19,27 +19,27 @@ struct SelectedFileInfo;
 namespace extensions {
 
 // Cancel file selection Dialog.  Closes the dialog window.
-class FileBrowserPrivateCancelDialogFunction
+class FileManagerPrivateCancelDialogFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.cancelDialog",
-                             FILEBROWSERPRIVATE_CANCELDIALOG)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.cancelDialog",
+                             FILEMANAGERPRIVATE_CANCELDIALOG)
 
  protected:
-  virtual ~FileBrowserPrivateCancelDialogFunction() {}
+  virtual ~FileManagerPrivateCancelDialogFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 };
 
-class FileBrowserPrivateSelectFileFunction
+class FileManagerPrivateSelectFileFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.selectFile",
-                             FILEBROWSERPRIVATE_SELECTFILE)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.selectFile",
+                             FILEMANAGERPRIVATE_SELECTFILE)
 
  protected:
-  virtual ~FileBrowserPrivateSelectFileFunction() {}
+  virtual ~FileManagerPrivateSelectFileFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -52,14 +52,14 @@ class FileBrowserPrivateSelectFileFunction
 };
 
 // Select multiple files.  Closes the dialog window.
-class FileBrowserPrivateSelectFilesFunction
+class FileManagerPrivateSelectFilesFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.selectFiles",
-                             FILEBROWSERPRIVATE_SELECTFILES)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.selectFiles",
+                             FILEMANAGERPRIVATE_SELECTFILES)
 
  protected:
-  virtual ~FileBrowserPrivateSelectFilesFunction() {}
+  virtual ~FileManagerPrivateSelectFilesFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
index ccc2780..00d4a53 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -34,7 +34,7 @@ using content::BrowserThread;
 using chromeos::file_system_provider::EntryMetadata;
 using chromeos::file_system_provider::ProvidedFileSystemInterface;
 using chromeos::file_system_provider::util::FileSystemURLParser;
-using extensions::api::file_browser_private::EntryProperties;
+using extensions::api::file_manager_private::EntryProperties;
 using file_manager::util::EntryDefinition;
 using file_manager::util::EntryDefinitionCallback;
 using file_manager::util::EntryDefinitionList;
@@ -445,19 +445,19 @@ class SingleEntryPropertiesGetterForFileSystemProvider {
 
 }  // namespace
 
-FileBrowserPrivateGetEntryPropertiesFunction::
-    FileBrowserPrivateGetEntryPropertiesFunction()
+FileManagerPrivateGetEntryPropertiesFunction::
+    FileManagerPrivateGetEntryPropertiesFunction()
     : processed_count_(0) {
 }
 
-FileBrowserPrivateGetEntryPropertiesFunction::
-    ~FileBrowserPrivateGetEntryPropertiesFunction() {
+FileManagerPrivateGetEntryPropertiesFunction::
+    ~FileManagerPrivateGetEntryPropertiesFunction() {
 }
 
-bool FileBrowserPrivateGetEntryPropertiesFunction::RunAsync() {
+bool FileManagerPrivateGetEntryPropertiesFunction::RunAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  using api::file_browser_private::GetEntryProperties::Params;
+  using api::file_manager_private::GetEntryProperties::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -475,7 +475,7 @@ bool FileBrowserPrivateGetEntryPropertiesFunction::RunAsync() {
         SingleEntryPropertiesGetterForDrive::Start(
             file_system_url.path(),
             GetProfile(),
-            base::Bind(&FileBrowserPrivateGetEntryPropertiesFunction::
+            base::Bind(&FileManagerPrivateGetEntryPropertiesFunction::
                            CompleteGetEntryProperties,
                        this,
                        i));
@@ -483,7 +483,7 @@ bool FileBrowserPrivateGetEntryPropertiesFunction::RunAsync() {
       case storage::kFileSystemTypeProvided:
         SingleEntryPropertiesGetterForFileSystemProvider::Start(
             file_system_url,
-            base::Bind(&FileBrowserPrivateGetEntryPropertiesFunction::
+            base::Bind(&FileManagerPrivateGetEntryPropertiesFunction::
                            CompleteGetEntryProperties,
                        this,
                        i));
@@ -499,7 +499,7 @@ bool FileBrowserPrivateGetEntryPropertiesFunction::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateGetEntryPropertiesFunction::CompleteGetEntryProperties(
+void FileManagerPrivateGetEntryPropertiesFunction::CompleteGetEntryProperties(
     size_t index,
     scoped_ptr<EntryProperties> properties,
     base::File::Error error) {
@@ -512,15 +512,15 @@ void FileBrowserPrivateGetEntryPropertiesFunction::CompleteGetEntryProperties(
   if (processed_count_ < properties_list_.size())
     return;
 
-  results_ = extensions::api::file_browser_private::GetEntryProperties::
+  results_ = extensions::api::file_manager_private::GetEntryProperties::
       Results::Create(properties_list_);
   SendResponse(true);
 }
 
-bool FileBrowserPrivatePinDriveFileFunction::RunAsync() {
+bool FileManagerPrivatePinDriveFileFunction::RunAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  using extensions::api::file_browser_private::PinDriveFile::Params;
+  using extensions::api::file_manager_private::PinDriveFile::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -534,17 +534,17 @@ bool FileBrowserPrivatePinDriveFileFunction::RunAsync() {
           render_view_host(), GetProfile(), GURL(params->file_url)));
   if (params->pin) {
     file_system->Pin(drive_path,
-                     base::Bind(&FileBrowserPrivatePinDriveFileFunction::
+                     base::Bind(&FileManagerPrivatePinDriveFileFunction::
                                     OnPinStateSet, this));
   } else {
     file_system->Unpin(drive_path,
-                       base::Bind(&FileBrowserPrivatePinDriveFileFunction::
+                       base::Bind(&FileManagerPrivatePinDriveFileFunction::
                                       OnPinStateSet, this));
   }
   return true;
 }
 
-void FileBrowserPrivatePinDriveFileFunction::
+void FileManagerPrivatePinDriveFileFunction::
     OnPinStateSet(drive::FileError error) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -556,16 +556,16 @@ void FileBrowserPrivatePinDriveFileFunction::
   }
 }
 
-FileBrowserPrivateGetDriveFilesFunction::
-    FileBrowserPrivateGetDriveFilesFunction() {
+FileManagerPrivateGetDriveFilesFunction::
+    FileManagerPrivateGetDriveFilesFunction() {
 }
 
-FileBrowserPrivateGetDriveFilesFunction::
-    ~FileBrowserPrivateGetDriveFilesFunction() {
+FileManagerPrivateGetDriveFilesFunction::
+    ~FileManagerPrivateGetDriveFilesFunction() {
 }
 
-bool FileBrowserPrivateGetDriveFilesFunction::RunAsync() {
-  using extensions::api::file_browser_private::GetDriveFiles::Params;
+bool FileManagerPrivateGetDriveFilesFunction::RunAsync() {
+  using extensions::api::file_manager_private::GetDriveFiles::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -582,10 +582,10 @@ bool FileBrowserPrivateGetDriveFilesFunction::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateGetDriveFilesFunction::GetFileOrSendResponse() {
+void FileManagerPrivateGetDriveFilesFunction::GetFileOrSendResponse() {
   // Send the response if all files are obtained.
   if (remaining_drive_paths_.empty()) {
-    results_ = extensions::api::file_browser_private::
+    results_ = extensions::api::file_manager_private::
         GetDriveFiles::Results::Create(local_paths_);
     SendResponse(true);
     return;
@@ -605,11 +605,11 @@ void FileBrowserPrivateGetDriveFilesFunction::GetFileOrSendResponse() {
 
   file_system->GetFile(
       drive_path,
-      base::Bind(&FileBrowserPrivateGetDriveFilesFunction::OnFileReady, this));
+      base::Bind(&FileManagerPrivateGetDriveFilesFunction::OnFileReady, this));
 }
 
 
-void FileBrowserPrivateGetDriveFilesFunction::OnFileReady(
+void FileManagerPrivateGetDriveFilesFunction::OnFileReady(
     drive::FileError error,
     const base::FilePath& local_path,
     scoped_ptr<drive::ResourceEntry> entry) {
@@ -630,8 +630,8 @@ void FileBrowserPrivateGetDriveFilesFunction::OnFileReady(
   GetFileOrSendResponse();
 }
 
-bool FileBrowserPrivateCancelFileTransfersFunction::RunAsync() {
-  using extensions::api::file_browser_private::CancelFileTransfers::Params;
+bool FileManagerPrivateCancelFileTransfersFunction::RunAsync() {
+  using extensions::api::file_manager_private::CancelFileTransfers::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -653,7 +653,7 @@ bool FileBrowserPrivateCancelFileTransfersFunction::RunAsync() {
   }
 
   // Cancel by Job ID.
-  std::vector<linked_ptr<api::file_browser_private::
+  std::vector<linked_ptr<api::file_manager_private::
                          FileTransferCancelStatus> > responses;
   for (size_t i = 0; i < params->file_urls.size(); ++i) {
     base::FilePath file_path = file_manager::util::GetLocalPathFromURL(
@@ -670,22 +670,22 @@ bool FileBrowserPrivateCancelFileTransfersFunction::RunAsync() {
       for (size_t i = 0; i < it->second.size(); ++i)
         job_list->CancelJob(it->second[i]);
     }
-    linked_ptr<api::file_browser_private::FileTransferCancelStatus> result(
-        new api::file_browser_private::FileTransferCancelStatus);
+    linked_ptr<api::file_manager_private::FileTransferCancelStatus> result(
+        new api::file_manager_private::FileTransferCancelStatus);
     result->canceled = it != path_to_id_map.end();
     // TODO(kinaba): simplify cancelFileTransfer() to take single URL each time,
     // and eliminate this field; it is just returning a copy of the argument.
     result->file_url = params->file_urls[i];
     responses.push_back(result);
   }
-  results_ = api::file_browser_private::CancelFileTransfers::Results::Create(
+  results_ = api::file_manager_private::CancelFileTransfers::Results::Create(
       responses);
   SendResponse(true);
   return true;
 }
 
-bool FileBrowserPrivateSearchDriveFunction::RunAsync() {
-  using extensions::api::file_browser_private::SearchDrive::Params;
+bool FileManagerPrivateSearchDriveFunction::RunAsync() {
+  using extensions::api::file_manager_private::SearchDrive::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -698,11 +698,11 @@ bool FileBrowserPrivateSearchDriveFunction::RunAsync() {
 
   file_system->Search(
       params->search_params.query, GURL(params->search_params.next_feed),
-      base::Bind(&FileBrowserPrivateSearchDriveFunction::OnSearch, this));
+      base::Bind(&FileManagerPrivateSearchDriveFunction::OnSearch, this));
   return true;
 }
 
-void FileBrowserPrivateSearchDriveFunction::OnSearch(
+void FileManagerPrivateSearchDriveFunction::OnSearch(
     drive::FileError error,
     const GURL& next_link,
     scoped_ptr<SearchResultInfoList> results) {
@@ -720,13 +720,13 @@ void FileBrowserPrivateSearchDriveFunction::OnSearch(
       GetProfile(),
       extension_->id(),
       results_ref,
-      base::Bind(&FileBrowserPrivateSearchDriveFunction::OnEntryDefinitionList,
+      base::Bind(&FileManagerPrivateSearchDriveFunction::OnEntryDefinitionList,
                  this,
                  next_link,
                  base::Passed(&results)));
 }
 
-void FileBrowserPrivateSearchDriveFunction::OnEntryDefinitionList(
+void FileManagerPrivateSearchDriveFunction::OnEntryDefinitionList(
     const GURL& next_link,
     scoped_ptr<SearchResultInfoList> search_result_info_list,
     scoped_ptr<EntryDefinitionList> entry_definition_list) {
@@ -753,8 +753,8 @@ void FileBrowserPrivateSearchDriveFunction::OnEntryDefinitionList(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateSearchDriveMetadataFunction::RunAsync() {
-  using api::file_browser_private::SearchDriveMetadata::Params;
+bool FileManagerPrivateSearchDriveMetadataFunction::RunAsync() {
+  using api::file_manager_private::SearchDriveMetadata::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -764,7 +764,7 @@ bool FileBrowserPrivateSearchDriveMetadataFunction::RunAsync() {
                 "%s[%d] called. (types: '%s', maxResults: '%d')",
                 name().c_str(),
                 request_id(),
-                api::file_browser_private::ToString(
+                api::file_manager_private::ToString(
                     params->search_params.types).c_str(),
                 params->search_params.max_results);
   }
@@ -779,19 +779,19 @@ bool FileBrowserPrivateSearchDriveMetadataFunction::RunAsync() {
 
   int options = -1;
   switch (params->search_params.types) {
-    case api::file_browser_private::SEARCH_TYPE_EXCLUDE_DIRECTORIES:
+    case api::file_manager_private::SEARCH_TYPE_EXCLUDE_DIRECTORIES:
       options = drive::SEARCH_METADATA_EXCLUDE_DIRECTORIES;
       break;
-    case api::file_browser_private::SEARCH_TYPE_SHARED_WITH_ME:
+    case api::file_manager_private::SEARCH_TYPE_SHARED_WITH_ME:
       options = drive::SEARCH_METADATA_SHARED_WITH_ME;
       break;
-    case api::file_browser_private::SEARCH_TYPE_OFFLINE:
+    case api::file_manager_private::SEARCH_TYPE_OFFLINE:
       options = drive::SEARCH_METADATA_OFFLINE;
       break;
-    case api::file_browser_private::SEARCH_TYPE_ALL:
+    case api::file_manager_private::SEARCH_TYPE_ALL:
       options = drive::SEARCH_METADATA_ALL;
       break;
-    case api::file_browser_private::SEARCH_TYPE_NONE:
+    case api::file_manager_private::SEARCH_TYPE_NONE:
       break;
   }
   DCHECK_NE(options, -1);
@@ -800,12 +800,12 @@ bool FileBrowserPrivateSearchDriveMetadataFunction::RunAsync() {
       params->search_params.query,
       options,
       params->search_params.max_results,
-      base::Bind(&FileBrowserPrivateSearchDriveMetadataFunction::
+      base::Bind(&FileManagerPrivateSearchDriveMetadataFunction::
                      OnSearchMetadata, this));
   return true;
 }
 
-void FileBrowserPrivateSearchDriveMetadataFunction::OnSearchMetadata(
+void FileManagerPrivateSearchDriveMetadataFunction::OnSearchMetadata(
     drive::FileError error,
     scoped_ptr<drive::MetadataSearchResultVector> results) {
   if (error != drive::FILE_ERROR_OK) {
@@ -823,12 +823,12 @@ void FileBrowserPrivateSearchDriveMetadataFunction::OnSearchMetadata(
       extension_->id(),
       results_ref,
       base::Bind(
-          &FileBrowserPrivateSearchDriveMetadataFunction::OnEntryDefinitionList,
+          &FileManagerPrivateSearchDriveMetadataFunction::OnEntryDefinitionList,
           this,
           base::Passed(&results)));
 }
 
-void FileBrowserPrivateSearchDriveMetadataFunction::OnEntryDefinitionList(
+void FileManagerPrivateSearchDriveMetadataFunction::OnEntryDefinitionList(
     scoped_ptr<drive::MetadataSearchResultVector> search_result_info_list,
     scoped_ptr<EntryDefinitionList> entry_definition_list) {
   DCHECK_EQ(search_result_info_list->size(), entry_definition_list->size());
@@ -836,7 +836,7 @@ void FileBrowserPrivateSearchDriveMetadataFunction::OnEntryDefinitionList(
 
   // Convert Drive files to something File API stack can understand.  See
   // file_browser_handler_custom_bindings.cc and
-  // file_browser_private_custom_bindings.js for how this is magically
+  // file_manager_private_custom_bindings.js for how this is magically
   // converted to a FileEntry.
   for (size_t i = 0; i < entry_definition_list->size(); ++i) {
     base::DictionaryValue* result_dict = new base::DictionaryValue();
@@ -864,8 +864,8 @@ void FileBrowserPrivateSearchDriveMetadataFunction::OnEntryDefinitionList(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateGetDriveConnectionStateFunction::RunSync() {
-  api::file_browser_private::DriveConnectionState result;
+bool FileManagerPrivateGetDriveConnectionStateFunction::RunSync() {
+  api::file_manager_private::DriveConnectionState result;
 
   switch (drive::util::GetDriveConnectionStatus(GetProfile())) {
     case drive::util::DRIVE_DISCONNECTED_NOSERVICE:
@@ -888,7 +888,7 @@ bool FileBrowserPrivateGetDriveConnectionStateFunction::RunSync() {
       break;
   }
 
-  results_ = api::file_browser_private::GetDriveConnectionState::Results::
+  results_ = api::file_manager_private::GetDriveConnectionState::Results::
       Create(result);
 
   drive::EventLogger* logger = file_manager::util::GetLogger(GetProfile());
@@ -897,8 +897,8 @@ bool FileBrowserPrivateGetDriveConnectionStateFunction::RunSync() {
   return true;
 }
 
-bool FileBrowserPrivateRequestAccessTokenFunction::RunAsync() {
-  using extensions::api::file_browser_private::RequestAccessToken::Params;
+bool FileManagerPrivateRequestAccessTokenFunction::RunAsync() {
+  using extensions::api::file_manager_private::RequestAccessToken::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -919,20 +919,20 @@ bool FileBrowserPrivateRequestAccessTokenFunction::RunAsync() {
   // Retrieve the cached auth token (if available), otherwise the AuthService
   // instance will try to refetch it.
   drive_service->RequestAccessToken(
-      base::Bind(&FileBrowserPrivateRequestAccessTokenFunction::
+      base::Bind(&FileManagerPrivateRequestAccessTokenFunction::
                       OnAccessTokenFetched, this));
   return true;
 }
 
-void FileBrowserPrivateRequestAccessTokenFunction::OnAccessTokenFetched(
+void FileManagerPrivateRequestAccessTokenFunction::OnAccessTokenFetched(
     google_apis::GDataErrorCode code,
     const std::string& access_token) {
   SetResult(new base::StringValue(access_token));
   SendResponse(true);
 }
 
-bool FileBrowserPrivateGetShareUrlFunction::RunAsync() {
-  using extensions::api::file_browser_private::GetShareUrl::Params;
+bool FileManagerPrivateGetShareUrlFunction::RunAsync() {
+  using extensions::api::file_manager_private::GetShareUrl::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -952,11 +952,11 @@ bool FileBrowserPrivateGetShareUrlFunction::RunAsync() {
   file_system->GetShareUrl(
       drive_path,
       GURL("chrome-extension://" + extension_id()),  // embed origin
-      base::Bind(&FileBrowserPrivateGetShareUrlFunction::OnGetShareUrl, this));
+      base::Bind(&FileManagerPrivateGetShareUrlFunction::OnGetShareUrl, this));
   return true;
 }
 
-void FileBrowserPrivateGetShareUrlFunction::OnGetShareUrl(
+void FileManagerPrivateGetShareUrlFunction::OnGetShareUrl(
     drive::FileError error,
     const GURL& share_url) {
   if (error != drive::FILE_ERROR_OK) {
@@ -969,8 +969,8 @@ void FileBrowserPrivateGetShareUrlFunction::OnGetShareUrl(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateRequestDriveShareFunction::RunAsync() {
-  using extensions::api::file_browser_private::RequestDriveShare::Params;
+bool FileManagerPrivateRequestDriveShareFunction::RunAsync() {
+  using extensions::api::file_manager_private::RequestDriveShare::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -995,16 +995,16 @@ bool FileBrowserPrivateRequestDriveShareFunction::RunAsync() {
   google_apis::drive::PermissionRole role =
       google_apis::drive::PERMISSION_ROLE_READER;
   switch (params->share_type) {
-    case api::file_browser_private::DRIVE_SHARE_TYPE_NONE:
+    case api::file_manager_private::DRIVE_SHARE_TYPE_NONE:
       NOTREACHED();
       return false;
-    case api::file_browser_private::DRIVE_SHARE_TYPE_CAN_EDIT:
+    case api::file_manager_private::DRIVE_SHARE_TYPE_CAN_EDIT:
       role = google_apis::drive::PERMISSION_ROLE_WRITER;
       break;
-    case api::file_browser_private::DRIVE_SHARE_TYPE_CAN_COMMENT:
+    case api::file_manager_private::DRIVE_SHARE_TYPE_CAN_COMMENT:
       role = google_apis::drive::PERMISSION_ROLE_COMMENTER;
       break;
-    case api::file_browser_private::DRIVE_SHARE_TYPE_CAN_VIEW:
+    case api::file_manager_private::DRIVE_SHARE_TYPE_CAN_VIEW:
       role = google_apis::drive::PERMISSION_ROLE_READER;
       break;
   }
@@ -1014,26 +1014,26 @@ bool FileBrowserPrivateRequestDriveShareFunction::RunAsync() {
       drive_path,
       user->email(),
       role,
-      base::Bind(&FileBrowserPrivateRequestDriveShareFunction::OnAddPermission,
+      base::Bind(&FileManagerPrivateRequestDriveShareFunction::OnAddPermission,
                  this));
   return true;
 }
 
-void FileBrowserPrivateRequestDriveShareFunction::OnAddPermission(
+void FileManagerPrivateRequestDriveShareFunction::OnAddPermission(
     drive::FileError error) {
   SendResponse(error == drive::FILE_ERROR_OK);
 }
 
-FileBrowserPrivateGetDownloadUrlFunction::
-    FileBrowserPrivateGetDownloadUrlFunction() {
+FileManagerPrivateGetDownloadUrlFunction::
+    FileManagerPrivateGetDownloadUrlFunction() {
 }
 
-FileBrowserPrivateGetDownloadUrlFunction::
-    ~FileBrowserPrivateGetDownloadUrlFunction() {
+FileManagerPrivateGetDownloadUrlFunction::
+    ~FileManagerPrivateGetDownloadUrlFunction() {
 }
 
-bool FileBrowserPrivateGetDownloadUrlFunction::RunAsync() {
-  using extensions::api::file_browser_private::GetShareUrl::Params;
+bool FileManagerPrivateGetDownloadUrlFunction::RunAsync() {
+  using extensions::api::file_manager_private::GetShareUrl::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -1058,12 +1058,12 @@ bool FileBrowserPrivateGetDownloadUrlFunction::RunAsync() {
 
   file_system->GetResourceEntry(
       file_path,
-      base::Bind(&FileBrowserPrivateGetDownloadUrlFunction::OnGetResourceEntry,
+      base::Bind(&FileManagerPrivateGetDownloadUrlFunction::OnGetResourceEntry,
                  this));
   return true;
 }
 
-void FileBrowserPrivateGetDownloadUrlFunction::OnGetResourceEntry(
+void FileManagerPrivateGetDownloadUrlFunction::OnGetResourceEntry(
     drive::FileError error,
     scoped_ptr<drive::ResourceEntry> entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ -1093,10 +1093,10 @@ void FileBrowserPrivateGetDownloadUrlFunction::OnGetResourceEntry(
                                    GetProfile()->GetRequestContext(),
                                    scopes));
   auth_service_->StartAuthentication(base::Bind(
-      &FileBrowserPrivateGetDownloadUrlFunction::OnTokenFetched, this));
+      &FileManagerPrivateGetDownloadUrlFunction::OnTokenFetched, this));
 }
 
-void FileBrowserPrivateGetDownloadUrlFunction::OnTokenFetched(
+void FileManagerPrivateGetDownloadUrlFunction::OnTokenFetched(
     google_apis::GDataErrorCode code,
     const std::string& access_token) {
   if (code != google_apis::HTTP_SUCCESS) {
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
index 53634dc..9c7be6a 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.h
@@ -27,24 +27,24 @@ class AuthService;
 namespace extensions {
 
 namespace api {
-namespace file_browser_private {
+namespace file_manager_private {
 struct EntryProperties;
-}  // namespace file_browser_private
+}  // namespace file_manager_private
 }  // namespace api
 
 // Retrieves property information for an entry and returns it as a dictionary.
 // On error, returns a dictionary with the key "error" set to the error number
 // (base::File::Error).
-class FileBrowserPrivateGetEntryPropertiesFunction
+class FileManagerPrivateGetEntryPropertiesFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getEntryProperties",
-                             FILEBROWSERPRIVATE_GETENTRYPROPERTIES)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getEntryProperties",
+                             FILEMANAGERPRIVATE_GETENTRYPROPERTIES)
 
-  FileBrowserPrivateGetEntryPropertiesFunction();
+  FileManagerPrivateGetEntryPropertiesFunction();
 
  protected:
-  virtual ~FileBrowserPrivateGetEntryPropertiesFunction();
+  virtual ~FileManagerPrivateGetEntryPropertiesFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -52,23 +52,23 @@ class FileBrowserPrivateGetEntryPropertiesFunction
  private:
   void CompleteGetEntryProperties(
       size_t index,
-      scoped_ptr<api::file_browser_private::EntryProperties> properties,
+      scoped_ptr<api::file_manager_private::EntryProperties> properties,
       base::File::Error error);
 
   size_t processed_count_;
-  std::vector<linked_ptr<api::file_browser_private::EntryProperties> >
+  std::vector<linked_ptr<api::file_manager_private::EntryProperties> >
       properties_list_;
 };
 
-// Implements the chrome.fileBrowserPrivate.pinDriveFile method.
-class FileBrowserPrivatePinDriveFileFunction
+// Implements the chrome.fileManagerPrivate.pinDriveFile method.
+class FileManagerPrivatePinDriveFileFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.pinDriveFile",
-                             FILEBROWSERPRIVATE_PINDRIVEFILE)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.pinDriveFile",
+                             FILEMANAGERPRIVATE_PINDRIVEFILE)
 
  protected:
-  virtual ~FileBrowserPrivatePinDriveFileFunction() {}
+  virtual ~FileManagerPrivatePinDriveFileFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -86,16 +86,16 @@ class FileBrowserPrivatePinDriveFileFunction
 // file manager should check if the local paths returned from getDriveFiles()
 // contain empty paths.
 // TODO(satorux): Should we propagate error types to the JavaScript layer?
-class FileBrowserPrivateGetDriveFilesFunction
+class FileManagerPrivateGetDriveFilesFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getDriveFiles",
-                             FILEBROWSERPRIVATE_GETDRIVEFILES)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getDriveFiles",
+                             FILEMANAGERPRIVATE_GETDRIVEFILES)
 
-  FileBrowserPrivateGetDriveFilesFunction();
+  FileManagerPrivateGetDriveFilesFunction();
 
  protected:
-  virtual ~FileBrowserPrivateGetDriveFilesFunction();
+  virtual ~FileManagerPrivateGetDriveFilesFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -115,30 +115,30 @@ class FileBrowserPrivateGetDriveFilesFunction
   std::vector<std::string> local_paths_;
 };
 
-// Implements the chrome.fileBrowserPrivate.cancelFileTransfers method.
-class FileBrowserPrivateCancelFileTransfersFunction
+// Implements the chrome.fileManagerPrivate.cancelFileTransfers method.
+class FileManagerPrivateCancelFileTransfersFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.cancelFileTransfers",
-                             FILEBROWSERPRIVATE_CANCELFILETRANSFERS)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.cancelFileTransfers",
+                             FILEMANAGERPRIVATE_CANCELFILETRANSFERS)
 
  protected:
-  virtual ~FileBrowserPrivateCancelFileTransfersFunction() {}
+  virtual ~FileManagerPrivateCancelFileTransfersFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 };
 
-class FileBrowserPrivateSearchDriveFunction
+class FileManagerPrivateSearchDriveFunction
     : public LoggedAsyncExtensionFunction {
  public:
   typedef std::vector<drive::SearchResultInfo> SearchResultInfoList;
 
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.searchDrive",
-                             FILEBROWSERPRIVATE_SEARCHDRIVE)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.searchDrive",
+                             FILEMANAGERPRIVATE_SEARCHDRIVE)
 
  protected:
-  virtual ~FileBrowserPrivateSearchDriveFunction() {}
+  virtual ~FileManagerPrivateSearchDriveFunction() {}
 
   virtual bool RunAsync() OVERRIDE;
 
@@ -157,16 +157,16 @@ class FileBrowserPrivateSearchDriveFunction
           entry_definition_list);
 };
 
-// Similar to FileBrowserPrivateSearchDriveFunction but this one is used for
+// Similar to FileManagerPrivateSearchDriveFunction but this one is used for
 // searching drive metadata which is stored locally.
-class FileBrowserPrivateSearchDriveMetadataFunction
+class FileManagerPrivateSearchDriveMetadataFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.searchDriveMetadata",
-                             FILEBROWSERPRIVATE_SEARCHDRIVEMETADATA)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.searchDriveMetadata",
+                             FILEMANAGERPRIVATE_SEARCHDRIVEMETADATA)
 
  protected:
-  virtual ~FileBrowserPrivateSearchDriveMetadataFunction() {}
+  virtual ~FileManagerPrivateSearchDriveMetadataFunction() {}
 
   virtual bool RunAsync() OVERRIDE;
 
@@ -183,29 +183,29 @@ class FileBrowserPrivateSearchDriveMetadataFunction
           entry_definition_list);
 };
 
-// Implements the chrome.fileBrowserPrivate.getDriveConnectionState method.
-class FileBrowserPrivateGetDriveConnectionStateFunction
+// Implements the chrome.fileManagerPrivate.getDriveConnectionState method.
+class FileManagerPrivateGetDriveConnectionStateFunction
     : public ChromeSyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION(
-      "fileBrowserPrivate.getDriveConnectionState",
-      FILEBROWSERPRIVATE_GETDRIVECONNECTIONSTATE);
+      "fileManagerPrivate.getDriveConnectionState",
+      FILEMANAGERPRIVATE_GETDRIVECONNECTIONSTATE);
 
  protected:
-  virtual ~FileBrowserPrivateGetDriveConnectionStateFunction() {}
+  virtual ~FileManagerPrivateGetDriveConnectionStateFunction() {}
 
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.requestAccessToken method.
-class FileBrowserPrivateRequestAccessTokenFunction
+// Implements the chrome.fileManagerPrivate.requestAccessToken method.
+class FileManagerPrivateRequestAccessTokenFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.requestAccessToken",
-                             FILEBROWSERPRIVATE_REQUESTACCESSTOKEN)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.requestAccessToken",
+                             FILEMANAGERPRIVATE_REQUESTACCESSTOKEN)
 
  protected:
-  virtual ~FileBrowserPrivateRequestAccessTokenFunction() {}
+  virtual ~FileManagerPrivateRequestAccessTokenFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -215,15 +215,15 @@ class FileBrowserPrivateRequestAccessTokenFunction
                             const std::string& access_token);
 };
 
-// Implements the chrome.fileBrowserPrivate.getShareUrl method.
-class FileBrowserPrivateGetShareUrlFunction
+// Implements the chrome.fileManagerPrivate.getShareUrl method.
+class FileManagerPrivateGetShareUrlFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getShareUrl",
-                             FILEBROWSERPRIVATE_GETSHAREURL)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getShareUrl",
+                             FILEMANAGERPRIVATE_GETSHAREURL)
 
  protected:
-  virtual ~FileBrowserPrivateGetShareUrlFunction() {}
+  virtual ~FileManagerPrivateGetShareUrlFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -233,15 +233,15 @@ class FileBrowserPrivateGetShareUrlFunction
   void OnGetShareUrl(drive::FileError error, const GURL& share_url);
 };
 
-// Implements the chrome.fileBrowserPrivate.requestDriveShare method.
-class FileBrowserPrivateRequestDriveShareFunction
+// Implements the chrome.fileManagerPrivate.requestDriveShare method.
+class FileManagerPrivateRequestDriveShareFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.requestDriveShare",
-                             FILEBROWSERPRIVATE_REQUESTDRIVESHARE);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.requestDriveShare",
+                             FILEMANAGERPRIVATE_REQUESTDRIVESHARE);
 
  protected:
-  virtual ~FileBrowserPrivateRequestDriveShareFunction() {}
+  virtual ~FileManagerPrivateRequestDriveShareFunction() {}
   virtual bool RunAsync() OVERRIDE;
 
  private:
@@ -249,17 +249,17 @@ class FileBrowserPrivateRequestDriveShareFunction
   void OnAddPermission(drive::FileError error);
 };
 
-// Implements the chrome.fileBrowserPrivate.getDownloadUrl method.
-class FileBrowserPrivateGetDownloadUrlFunction
+// Implements the chrome.fileManagerPrivate.getDownloadUrl method.
+class FileManagerPrivateGetDownloadUrlFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  FileBrowserPrivateGetDownloadUrlFunction();
+  FileManagerPrivateGetDownloadUrlFunction();
 
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getDownloadUrl",
-                             FILEBROWSERPRIVATE_GETDOWNLOADURL)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getDownloadUrl",
+                             FILEMANAGERPRIVATE_GETDOWNLOADURL)
 
  protected:
-  virtual ~FileBrowserPrivateGetDownloadUrlFunction();
+  virtual ~FileManagerPrivateGetDownloadUrlFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
index 2953ea3..18b32e7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.cc
@@ -16,15 +16,15 @@
 #include "chrome/browser/chromeos/drive/file_system_interface.h"
 #include "chrome/browser/chromeos/drive/file_system_util.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/file_manager_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/fileapi_util.h"
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
-#include "chrome/common/extensions/api/file_browser_private_internal.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
+#include "chrome/common/extensions/api/file_manager_private_internal.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
@@ -83,7 +83,7 @@ file_manager::EventRouter* GetEventRouterByProfileId(void* profile_id) {
   if (!g_browser_process->profile_manager()->IsValidProfile(profile))
     return NULL;
 
-  return file_manager::FileBrowserPrivateAPI::Get(profile)->event_router();
+  return file_manager::FileManagerPrivateAPI::Get(profile)->event_router();
 }
 
 // Notifies the copy progress to extensions via event router.
@@ -203,7 +203,7 @@ void CancelCopyOnIOThread(
 
 }  // namespace
 
-void FileBrowserPrivateRequestFileSystemFunction::DidFail(
+void FileManagerPrivateRequestFileSystemFunction::DidFail(
     base::File::Error error_code) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -212,7 +212,7 @@ void FileBrowserPrivateRequestFileSystemFunction::DidFail(
 }
 
 bool
-FileBrowserPrivateRequestFileSystemFunction::SetupFileSystemAccessPermissions(
+FileManagerPrivateRequestFileSystemFunction::SetupFileSystemAccessPermissions(
     scoped_refptr<storage::FileSystemContext> file_system_context,
     int child_id,
     Profile* profile,
@@ -262,9 +262,9 @@ FileBrowserPrivateRequestFileSystemFunction::SetupFileSystemAccessPermissions(
   return true;
 }
 
-bool FileBrowserPrivateRequestFileSystemFunction::RunAsync() {
+bool FileManagerPrivateRequestFileSystemFunction::RunAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  using extensions::api::file_browser_private::RequestFileSystem::Params;
+  using extensions::api::file_manager_private::RequestFileSystem::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -313,12 +313,12 @@ bool FileBrowserPrivateRequestFileSystemFunction::RunAsync() {
       extension_id(),
       file_definition,
       base::Bind(
-          &FileBrowserPrivateRequestFileSystemFunction::OnEntryDefinition,
+          &FileManagerPrivateRequestFileSystemFunction::OnEntryDefinition,
           this));
   return true;
 }
 
-void FileBrowserPrivateRequestFileSystemFunction::OnEntryDefinition(
+void FileManagerPrivateRequestFileSystemFunction::OnEntryDefinition(
     const EntryDefinition& entry_definition) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -374,35 +374,35 @@ bool FileWatchFunctionBase::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateAddFileWatchFunction::PerformFileWatchOperation(
+void FileManagerPrivateAddFileWatchFunction::PerformFileWatchOperation(
     const base::FilePath& local_path,
     const base::FilePath& virtual_path,
     const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   file_manager::EventRouter* event_router =
-      file_manager::FileBrowserPrivateAPI::Get(GetProfile())->event_router();
+      file_manager::FileManagerPrivateAPI::Get(GetProfile())->event_router();
   event_router->AddFileWatch(
       local_path,
       virtual_path,
       extension_id,
-      base::Bind(&FileBrowserPrivateAddFileWatchFunction::Respond, this));
+      base::Bind(&FileManagerPrivateAddFileWatchFunction::Respond, this));
 }
 
-void FileBrowserPrivateRemoveFileWatchFunction::PerformFileWatchOperation(
+void FileManagerPrivateRemoveFileWatchFunction::PerformFileWatchOperation(
     const base::FilePath& local_path,
     const base::FilePath& unused,
     const std::string& extension_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   file_manager::EventRouter* event_router =
-      file_manager::FileBrowserPrivateAPI::Get(GetProfile())->event_router();
+      file_manager::FileManagerPrivateAPI::Get(GetProfile())->event_router();
   event_router->RemoveFileWatch(local_path, extension_id);
   Respond(true);
 }
 
-bool FileBrowserPrivateGetSizeStatsFunction::RunAsync() {
-  using extensions::api::file_browser_private::GetSizeStats::Params;
+bool FileManagerPrivateGetSizeStatsFunction::RunAsync() {
+  using extensions::api::file_manager_private::GetSizeStats::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -428,7 +428,7 @@ bool FileBrowserPrivateGetSizeStatsFunction::RunAsync() {
     }
 
     file_system->GetAvailableSpace(
-        base::Bind(&FileBrowserPrivateGetSizeStatsFunction::
+        base::Bind(&FileManagerPrivateGetSizeStatsFunction::
                        GetDriveAvailableSpaceCallback,
                    this));
   } else {
@@ -440,7 +440,7 @@ bool FileBrowserPrivateGetSizeStatsFunction::RunAsync() {
                    volume_info.mount_path.value(),
                    total_size,
                    remaining_size),
-        base::Bind(&FileBrowserPrivateGetSizeStatsFunction::
+        base::Bind(&FileManagerPrivateGetSizeStatsFunction::
                        GetSizeStatsCallback,
                    this,
                    base::Owned(total_size),
@@ -449,7 +449,7 @@ bool FileBrowserPrivateGetSizeStatsFunction::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateGetSizeStatsFunction::GetDriveAvailableSpaceCallback(
+void FileManagerPrivateGetSizeStatsFunction::GetDriveAvailableSpaceCallback(
     drive::FileError error,
     int64 bytes_total,
     int64 bytes_used) {
@@ -464,7 +464,7 @@ void FileBrowserPrivateGetSizeStatsFunction::GetDriveAvailableSpaceCallback(
   }
 }
 
-void FileBrowserPrivateGetSizeStatsFunction::GetSizeStatsCallback(
+void FileManagerPrivateGetSizeStatsFunction::GetSizeStatsCallback(
     const uint64* total_size,
     const uint64* remaining_size) {
   base::DictionaryValue* sizes = new base::DictionaryValue();
@@ -476,8 +476,8 @@ void FileBrowserPrivateGetSizeStatsFunction::GetSizeStatsCallback(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateValidatePathNameLengthFunction::RunAsync() {
-  using extensions::api::file_browser_private::ValidatePathNameLength::Params;
+bool FileManagerPrivateValidatePathNameLengthFunction::RunAsync() {
+  using extensions::api::file_manager_private::ValidatePathNameLength::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -502,21 +502,21 @@ bool FileBrowserPrivateValidatePathNameLengthFunction::RunAsync() {
       FROM_HERE,
       base::Bind(&GetFileNameMaxLengthOnBlockingPool,
                  filesystem_url.path().AsUTF8Unsafe()),
-      base::Bind(&FileBrowserPrivateValidatePathNameLengthFunction::
+      base::Bind(&FileManagerPrivateValidatePathNameLengthFunction::
                      OnFilePathLimitRetrieved,
                  this, params->name.size()));
   return true;
 }
 
-void FileBrowserPrivateValidatePathNameLengthFunction::OnFilePathLimitRetrieved(
+void FileManagerPrivateValidatePathNameLengthFunction::OnFilePathLimitRetrieved(
     size_t current_length,
     size_t max_length) {
   SetResult(new base::FundamentalValue(current_length <= max_length));
   SendResponse(true);
 }
 
-bool FileBrowserPrivateFormatVolumeFunction::RunAsync() {
-  using extensions::api::file_browser_private::FormatVolume::Params;
+bool FileManagerPrivateFormatVolumeFunction::RunAsync() {
+  using extensions::api::file_manager_private::FormatVolume::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -536,10 +536,10 @@ bool FileBrowserPrivateFormatVolumeFunction::RunAsync() {
   return true;
 }
 
-bool FileBrowserPrivateStartCopyFunction::RunAsync() {
+bool FileManagerPrivateStartCopyFunction::RunAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  using  extensions::api::file_browser_private::StartCopy::Params;
+  using  extensions::api::file_manager_private::StartCopy::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -579,11 +579,11 @@ bool FileBrowserPrivateStartCopyFunction::RunAsync() {
                  file_system_context,
                  source_url,
                  destination_url),
-      base::Bind(&FileBrowserPrivateStartCopyFunction::RunAfterStartCopy,
+      base::Bind(&FileManagerPrivateStartCopyFunction::RunAfterStartCopy,
                  this));
 }
 
-void FileBrowserPrivateStartCopyFunction::RunAfterStartCopy(
+void FileManagerPrivateStartCopyFunction::RunAfterStartCopy(
     int operation_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ -591,10 +591,10 @@ void FileBrowserPrivateStartCopyFunction::RunAfterStartCopy(
   SendResponse(true);
 }
 
-bool FileBrowserPrivateCancelCopyFunction::RunAsync() {
+bool FileManagerPrivateCancelCopyFunction::RunAsync() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  using extensions::api::file_browser_private::CancelCopy::Params;
+  using extensions::api::file_manager_private::CancelCopy::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -611,8 +611,8 @@ bool FileBrowserPrivateCancelCopyFunction::RunAsync() {
   return true;
 }
 
-bool FileBrowserPrivateInternalResolveIsolatedEntriesFunction::RunAsync() {
-  using extensions::api::file_browser_private_internal::ResolveIsolatedEntries::
+bool FileManagerPrivateInternalResolveIsolatedEntriesFunction::RunAsync() {
+  using extensions::api::file_manager_private_internal::ResolveIsolatedEntries::
       Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
@@ -651,16 +651,16 @@ bool FileBrowserPrivateInternalResolveIsolatedEntriesFunction::RunAsync() {
       extension_->id(),
       file_definition_list,  // Safe, since copied internally.
       base::Bind(
-          &FileBrowserPrivateInternalResolveIsolatedEntriesFunction::
+          &FileManagerPrivateInternalResolveIsolatedEntriesFunction::
               RunAsyncAfterConvertFileDefinitionListToEntryDefinitionList,
           this));
   return true;
 }
 
-void FileBrowserPrivateInternalResolveIsolatedEntriesFunction::
+void FileManagerPrivateInternalResolveIsolatedEntriesFunction::
     RunAsyncAfterConvertFileDefinitionListToEntryDefinitionList(scoped_ptr<
         file_manager::util::EntryDefinitionList> entry_definition_list) {
-  using extensions::api::file_browser_private_internal::EntryDescription;
+  using extensions::api::file_manager_private_internal::EntryDescription;
   std::vector<linked_ptr<EntryDescription> > entries;
 
   for (size_t i = 0; i < entry_definition_list->size(); ++i) {
@@ -675,7 +675,7 @@ void FileBrowserPrivateInternalResolveIsolatedEntriesFunction::
     entries.push_back(entry);
   }
 
-  results_ = extensions::api::file_browser_private_internal::
+  results_ = extensions::api::file_manager_private_internal::
       ResolveIsolatedEntries::Results::Create(entries);
   SendResponse(true);
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
index 27375e2..2048f53 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_file_system.h
@@ -31,15 +31,15 @@ typedef std::vector<EntryDefinition> EntryDefinitionList;
 
 namespace extensions {
 
-// Implements the chrome.fileBrowserPrivate.requestFileSystem method.
-class FileBrowserPrivateRequestFileSystemFunction
+// Implements the chrome.fileManagerPrivate.requestFileSystem method.
+class FileManagerPrivateRequestFileSystemFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.requestFileSystem",
-                             FILEBROWSERPRIVATE_REQUESTFILESYSTEM)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.requestFileSystem",
+                             FILEMANAGERPRIVATE_REQUESTFILESYSTEM)
 
  protected:
-  virtual ~FileBrowserPrivateRequestFileSystemFunction() {}
+  virtual ~FileManagerPrivateRequestFileSystemFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -66,8 +66,8 @@ class FileBrowserPrivateRequestFileSystemFunction
       const file_manager::util::EntryDefinition& entry_definition);
 };
 
-// Base class for FileBrowserPrivateAddFileWatchFunction and
-// FileBrowserPrivateRemoveFileWatchFunction. Although it's called "FileWatch",
+// Base class for FileManagerPrivateAddFileWatchFunction and
+// FileManagerPrivateRemoveFileWatchFunction. Although it's called "FileWatch",
 // the class and its sub classes are used only for watching changes in
 // directories.
 class FileWatchFunctionBase : public LoggedAsyncExtensionFunction {
@@ -87,15 +87,15 @@ class FileWatchFunctionBase : public LoggedAsyncExtensionFunction {
   void Respond(bool success);
 };
 
-// Implements the chrome.fileBrowserPrivate.addFileWatch method.
+// Implements the chrome.fileManagerPrivate.addFileWatch method.
 // Starts watching changes in directories.
-class FileBrowserPrivateAddFileWatchFunction : public FileWatchFunctionBase {
+class FileManagerPrivateAddFileWatchFunction : public FileWatchFunctionBase {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.addFileWatch",
-                             FILEBROWSERPRIVATE_ADDFILEWATCH)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.addFileWatch",
+                             FILEMANAGERPRIVATE_ADDFILEWATCH)
 
  protected:
-  virtual ~FileBrowserPrivateAddFileWatchFunction() {}
+  virtual ~FileManagerPrivateAddFileWatchFunction() {}
 
   // FileWatchFunctionBase override.
   virtual void PerformFileWatchOperation(
@@ -105,15 +105,15 @@ class FileBrowserPrivateAddFileWatchFunction : public FileWatchFunctionBase {
 };
 
 
-// Implements the chrome.fileBrowserPrivate.removeFileWatch method.
+// Implements the chrome.fileManagerPrivate.removeFileWatch method.
 // Stops watching changes in directories.
-class FileBrowserPrivateRemoveFileWatchFunction : public FileWatchFunctionBase {
+class FileManagerPrivateRemoveFileWatchFunction : public FileWatchFunctionBase {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.removeFileWatch",
-                             FILEBROWSERPRIVATE_REMOVEFILEWATCH)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.removeFileWatch",
+                             FILEMANAGERPRIVATE_REMOVEFILEWATCH)
 
  protected:
-  virtual ~FileBrowserPrivateRemoveFileWatchFunction() {}
+  virtual ~FileManagerPrivateRemoveFileWatchFunction() {}
 
   // FileWatchFunctionBase override.
   virtual void PerformFileWatchOperation(
@@ -122,15 +122,15 @@ class FileBrowserPrivateRemoveFileWatchFunction : public FileWatchFunctionBase {
       const std::string& extension_id) OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.getSizeStats method.
-class FileBrowserPrivateGetSizeStatsFunction
+// Implements the chrome.fileManagerPrivate.getSizeStats method.
+class FileManagerPrivateGetSizeStatsFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getSizeStats",
-                             FILEBROWSERPRIVATE_GETSIZESTATS)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getSizeStats",
+                             FILEMANAGERPRIVATE_GETSIZESTATS)
 
  protected:
-  virtual ~FileBrowserPrivateGetSizeStatsFunction() {}
+  virtual ~FileManagerPrivateGetSizeStatsFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -144,15 +144,15 @@ class FileBrowserPrivateGetSizeStatsFunction
                             const uint64* remaining_size);
 };
 
-// Implements the chrome.fileBrowserPrivate.validatePathNameLength method.
-class FileBrowserPrivateValidatePathNameLengthFunction
+// Implements the chrome.fileManagerPrivate.validatePathNameLength method.
+class FileManagerPrivateValidatePathNameLengthFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.validatePathNameLength",
-                             FILEBROWSERPRIVATE_VALIDATEPATHNAMELENGTH)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.validatePathNameLength",
+                             FILEMANAGERPRIVATE_VALIDATEPATHNAMELENGTH)
 
  protected:
-  virtual ~FileBrowserPrivateValidatePathNameLengthFunction() {}
+  virtual ~FileManagerPrivateValidatePathNameLengthFunction() {}
 
   void OnFilePathLimitRetrieved(size_t current_length, size_t max_length);
 
@@ -160,30 +160,30 @@ class FileBrowserPrivateValidatePathNameLengthFunction
   virtual bool RunAsync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.formatVolume method.
+// Implements the chrome.fileManagerPrivate.formatVolume method.
 // Formats Volume given its mount path.
-class FileBrowserPrivateFormatVolumeFunction
+class FileManagerPrivateFormatVolumeFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.formatVolume",
-                             FILEBROWSERPRIVATE_FORMATVOLUME)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.formatVolume",
+                             FILEMANAGERPRIVATE_FORMATVOLUME)
 
  protected:
-  virtual ~FileBrowserPrivateFormatVolumeFunction() {}
+  virtual ~FileManagerPrivateFormatVolumeFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.startCopy method.
-class FileBrowserPrivateStartCopyFunction
+// Implements the chrome.fileManagerPrivate.startCopy method.
+class FileManagerPrivateStartCopyFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.startCopy",
-                             FILEBROWSERPRIVATE_STARTCOPY)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.startCopy",
+                             FILEMANAGERPRIVATE_STARTCOPY)
 
  protected:
-  virtual ~FileBrowserPrivateStartCopyFunction() {}
+  virtual ~FileManagerPrivateStartCopyFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -193,31 +193,31 @@ class FileBrowserPrivateStartCopyFunction
   void RunAfterStartCopy(int operation_id);
 };
 
-// Implements the chrome.fileBrowserPrivate.cancelCopy method.
-class FileBrowserPrivateCancelCopyFunction
+// Implements the chrome.fileManagerPrivate.cancelCopy method.
+class FileManagerPrivateCancelCopyFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.cancelCopy",
-                             FILEBROWSERPRIVATE_CANCELCOPY)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.cancelCopy",
+                             FILEMANAGERPRIVATE_CANCELCOPY)
 
  protected:
-  virtual ~FileBrowserPrivateCancelCopyFunction() {}
+  virtual ~FileManagerPrivateCancelCopyFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivateInternal.resolveIsolatedEntries
+// Implements the chrome.fileManagerPrivateInternal.resolveIsolatedEntries
 // method.
-class FileBrowserPrivateInternalResolveIsolatedEntriesFunction
+class FileManagerPrivateInternalResolveIsolatedEntriesFunction
     : public ChromeAsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION(
-      "fileBrowserPrivateInternal.resolveIsolatedEntries",
-      FILEBROWSERPRIVATE_RESOLVEISOLATEDENTRIES)
+      "fileManagerPrivateInternal.resolveIsolatedEntries",
+      FILEMANAGERPRIVATE_RESOLVEISOLATEDENTRIES)
 
  protected:
-  virtual ~FileBrowserPrivateInternalResolveIsolatedEntriesFunction() {}
+  virtual ~FileManagerPrivateInternalResolveIsolatedEntriesFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index addfaa2..2b601c8 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -11,7 +11,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/app_installer.h"
 #include "chrome/browser/chromeos/file_manager/zip_file_creator.h"
@@ -28,7 +28,7 @@
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "chrome/common/pref_names.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
@@ -60,13 +60,13 @@ AppWindow* GetCurrentAppWindow(ChromeSyncExtensionFunction* function) {
                           : NULL;
 }
 
-std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >
+std::vector<linked_ptr<api::file_manager_private::ProfileInfo> >
 GetLoggedInProfileInfoList() {
   DCHECK(user_manager::UserManager::IsInitialized());
   const std::vector<Profile*>& profiles =
       g_browser_process->profile_manager()->GetLoadedProfiles();
   std::set<Profile*> original_profiles;
-  std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >
+  std::vector<linked_ptr<api::file_manager_private::ProfileInfo> >
       result_profiles;
 
   for (size_t i = 0; i < profiles.size(); ++i) {
@@ -81,8 +81,8 @@ GetLoggedInProfileInfoList() {
       continue;
 
     // Make a ProfileInfo.
-    linked_ptr<api::file_browser_private::ProfileInfo> profile_info(
-        new api::file_browser_private::ProfileInfo());
+    linked_ptr<api::file_manager_private::ProfileInfo> profile_info(
+        new api::file_manager_private::ProfileInfo());
     profile_info->profile_id = multi_user_util::GetUserIDFromProfile(profile);
     profile_info->display_name = UTF16ToUTF8(user->GetDisplayName());
     // TODO(hirono): Remove the property from the profile_info.
@@ -95,7 +95,7 @@ GetLoggedInProfileInfoList() {
 }
 } // namespace
 
-bool FileBrowserPrivateLogoutUserForReauthenticationFunction::RunSync() {
+bool FileManagerPrivateLogoutUserForReauthenticationFunction::RunSync() {
   user_manager::User* user =
       chromeos::ProfileHelper::Get()->GetUserByProfile(GetProfile());
   if (user) {
@@ -107,8 +107,8 @@ bool FileBrowserPrivateLogoutUserForReauthenticationFunction::RunSync() {
   return true;
 }
 
-bool FileBrowserPrivateGetPreferencesFunction::RunSync() {
-  api::file_browser_private::Preferences result;
+bool FileManagerPrivateGetPreferencesFunction::RunSync() {
+  api::file_manager_private::Preferences result;
   const PrefService* const service = GetProfile()->GetPrefs();
 
   result.drive_enabled = drive::util::IsDriveEnabledForProfile(GetProfile());
@@ -132,8 +132,8 @@ bool FileBrowserPrivateGetPreferencesFunction::RunSync() {
   return true;
 }
 
-bool FileBrowserPrivateSetPreferencesFunction::RunSync() {
-  using extensions::api::file_browser_private::SetPreferences::Params;
+bool FileManagerPrivateSetPreferencesFunction::RunSync() {
+  using extensions::api::file_manager_private::SetPreferences::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -153,14 +153,14 @@ bool FileBrowserPrivateSetPreferencesFunction::RunSync() {
   return true;
 }
 
-FileBrowserPrivateZipSelectionFunction::
-    FileBrowserPrivateZipSelectionFunction() {}
+FileManagerPrivateZipSelectionFunction::
+    FileManagerPrivateZipSelectionFunction() {}
 
-FileBrowserPrivateZipSelectionFunction::
-    ~FileBrowserPrivateZipSelectionFunction() {}
+FileManagerPrivateZipSelectionFunction::
+    ~FileManagerPrivateZipSelectionFunction() {}
 
-bool FileBrowserPrivateZipSelectionFunction::RunAsync() {
-  using extensions::api::file_browser_private::ZipSelection::Params;
+bool FileManagerPrivateZipSelectionFunction::RunAsync() {
+  using extensions::api::file_manager_private::ZipSelection::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -208,32 +208,32 @@ bool FileBrowserPrivateZipSelectionFunction::RunAsync() {
   }
 
   (new file_manager::ZipFileCreator(
-       base::Bind(&FileBrowserPrivateZipSelectionFunction::OnZipDone, this),
+       base::Bind(&FileManagerPrivateZipSelectionFunction::OnZipDone, this),
        src_dir,
        src_relative_paths,
        dest_file))->Start();
   return true;
 }
 
-void FileBrowserPrivateZipSelectionFunction::OnZipDone(bool success) {
+void FileManagerPrivateZipSelectionFunction::OnZipDone(bool success) {
   SetResult(new base::FundamentalValue(success));
   SendResponse(true);
 }
 
-bool FileBrowserPrivateZoomFunction::RunSync() {
-  using extensions::api::file_browser_private::Zoom::Params;
+bool FileManagerPrivateZoomFunction::RunSync() {
+  using extensions::api::file_manager_private::Zoom::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   content::PageZoom zoom_type;
   switch (params->operation) {
-    case api::file_browser_private::ZOOM_OPERATION_TYPE_IN:
+    case api::file_manager_private::ZOOM_OPERATION_TYPE_IN:
       zoom_type = content::PAGE_ZOOM_IN;
       break;
-    case api::file_browser_private::ZOOM_OPERATION_TYPE_OUT:
+    case api::file_manager_private::ZOOM_OPERATION_TYPE_OUT:
       zoom_type = content::PAGE_ZOOM_OUT;
       break;
-    case api::file_browser_private::ZOOM_OPERATION_TYPE_RESET:
+    case api::file_manager_private::ZOOM_OPERATION_TYPE_RESET:
       zoom_type = content::PAGE_ZOOM_RESET;
       break;
     default:
@@ -244,8 +244,8 @@ bool FileBrowserPrivateZoomFunction::RunSync() {
   return true;
 }
 
-bool FileBrowserPrivateInstallWebstoreItemFunction::RunAsync() {
-  using extensions::api::file_browser_private::InstallWebstoreItem::Params;
+bool FileManagerPrivateInstallWebstoreItemFunction::RunAsync() {
+  using extensions::api::file_manager_private::InstallWebstoreItem::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -254,7 +254,7 @@ bool FileBrowserPrivateInstallWebstoreItemFunction::RunAsync() {
 
   const extensions::WebstoreStandaloneInstaller::Callback callback =
       base::Bind(
-          &FileBrowserPrivateInstallWebstoreItemFunction::OnInstallComplete,
+          &FileManagerPrivateInstallWebstoreItemFunction::OnInstallComplete,
           this);
 
   // Only GoogleCastAPI extension can use silent installation.
@@ -275,7 +275,7 @@ bool FileBrowserPrivateInstallWebstoreItemFunction::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateInstallWebstoreItemFunction::OnInstallComplete(
+void FileManagerPrivateInstallWebstoreItemFunction::OnInstallComplete(
     bool success,
     const std::string& error,
     extensions::webstore_install::Result result) {
@@ -299,15 +299,15 @@ void FileBrowserPrivateInstallWebstoreItemFunction::OnInstallComplete(
   SendResponse(success);
 }
 
-FileBrowserPrivateRequestWebStoreAccessTokenFunction::
-    FileBrowserPrivateRequestWebStoreAccessTokenFunction() {
+FileManagerPrivateRequestWebStoreAccessTokenFunction::
+    FileManagerPrivateRequestWebStoreAccessTokenFunction() {
 }
 
-FileBrowserPrivateRequestWebStoreAccessTokenFunction::
-    ~FileBrowserPrivateRequestWebStoreAccessTokenFunction() {
+FileManagerPrivateRequestWebStoreAccessTokenFunction::
+    ~FileManagerPrivateRequestWebStoreAccessTokenFunction() {
 }
 
-bool FileBrowserPrivateRequestWebStoreAccessTokenFunction::RunAsync() {
+bool FileManagerPrivateRequestWebStoreAccessTokenFunction::RunAsync() {
   std::vector<std::string> scopes;
   scopes.push_back(kCWSScope);
 
@@ -335,14 +335,14 @@ bool FileBrowserPrivateRequestWebStoreAccessTokenFunction::RunAsync() {
       url_request_context_getter,
       scopes));
   auth_service_->StartAuthentication(base::Bind(
-      &FileBrowserPrivateRequestWebStoreAccessTokenFunction::
+      &FileManagerPrivateRequestWebStoreAccessTokenFunction::
           OnAccessTokenFetched,
       this));
 
   return true;
 }
 
-void FileBrowserPrivateRequestWebStoreAccessTokenFunction::OnAccessTokenFetched(
+void FileManagerPrivateRequestWebStoreAccessTokenFunction::OnAccessTokenFetched(
     google_apis::GDataErrorCode code,
     const std::string& access_token) {
   drive::EventLogger* logger = file_manager::util::GetLogger(GetProfile());
@@ -365,13 +365,13 @@ void FileBrowserPrivateRequestWebStoreAccessTokenFunction::OnAccessTokenFetched(
   }
 }
 
-bool FileBrowserPrivateGetProfilesFunction::RunSync() {
+bool FileManagerPrivateGetProfilesFunction::RunSync() {
 #if defined(USE_ATHENA)
   // TODO(oshima): Figure out what to do.
   return false;
 #endif
 
-  const std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >&
+  const std::vector<linked_ptr<api::file_manager_private::ProfileInfo> >&
       profiles = GetLoggedInProfileInfoList();
 
   // Obtains the display profile ID.
@@ -385,17 +385,17 @@ bool FileBrowserPrivateGetProfilesFunction::RunSync() {
                                          app_window->GetNativeWindow())
                                    : "";
 
-  results_ = api::file_browser_private::GetProfiles::Results::Create(
+  results_ = api::file_manager_private::GetProfiles::Results::Create(
       profiles,
       current_profile_id,
       display_profile_id.empty() ? current_profile_id : display_profile_id);
   return true;
 }
 
-bool FileBrowserPrivateVisitDesktopFunction::RunSync() {
-  using api::file_browser_private::VisitDesktop::Params;
+bool FileManagerPrivateVisitDesktopFunction::RunSync() {
+  using api::file_manager_private::VisitDesktop::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
-  const std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >&
+  const std::vector<linked_ptr<api::file_manager_private::ProfileInfo> >&
       profiles = GetLoggedInProfileInfoList();
 
   chrome::MultiUserWindowManager* const window_manager =
@@ -436,30 +436,30 @@ bool FileBrowserPrivateVisitDesktopFunction::RunSync() {
   return true;
 }
 
-bool FileBrowserPrivateOpenInspectorFunction::RunSync() {
-  using extensions::api::file_browser_private::OpenInspector::Params;
+bool FileManagerPrivateOpenInspectorFunction::RunSync() {
+  using extensions::api::file_manager_private::OpenInspector::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
   switch (params->type) {
-    case extensions::api::file_browser_private::INSPECTION_TYPE_NORMAL:
+    case extensions::api::file_manager_private::INSPECTION_TYPE_NORMAL:
       // Open inspector for foreground page.
       DevToolsWindow::OpenDevToolsWindow(
           content::WebContents::FromRenderViewHost(render_view_host()));
       break;
-    case extensions::api::file_browser_private::INSPECTION_TYPE_CONSOLE:
+    case extensions::api::file_manager_private::INSPECTION_TYPE_CONSOLE:
       // Open inspector for foreground page and bring focus to the console.
       DevToolsWindow::OpenDevToolsWindow(
           content::WebContents::FromRenderViewHost(render_view_host()),
           DevToolsToggleAction::ShowConsole());
       break;
-    case extensions::api::file_browser_private::INSPECTION_TYPE_ELEMENT:
+    case extensions::api::file_manager_private::INSPECTION_TYPE_ELEMENT:
       // Open inspector for foreground page in inspect element mode.
       DevToolsWindow::OpenDevToolsWindow(
           content::WebContents::FromRenderViewHost(render_view_host()),
           DevToolsToggleAction::Inspect());
       break;
-    case extensions::api::file_browser_private::INSPECTION_TYPE_BACKGROUND:
+    case extensions::api::file_manager_private::INSPECTION_TYPE_BACKGROUND:
       // Open inspector for background page.
       extensions::devtools_util::InspectBackgroundPage(extension(),
                                                        GetProfile());
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
index 923b301..c1efb0d 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
@@ -18,61 +18,61 @@ class AuthServiceInterface;
 
 namespace extensions {
 
-// Implements the chrome.fileBrowserPrivate.logoutUserForReauthentication
+// Implements the chrome.fileManagerPrivate.logoutUserForReauthentication
 // method.
-class FileBrowserPrivateLogoutUserForReauthenticationFunction
+class FileManagerPrivateLogoutUserForReauthenticationFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.logoutUserForReauthentication",
-                             FILEBROWSERPRIVATE_LOGOUTUSERFORREAUTHENTICATION)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.logoutUserForReauthentication",
+                             FILEMANAGERPRIVATE_LOGOUTUSERFORREAUTHENTICATION)
 
  protected:
-  virtual ~FileBrowserPrivateLogoutUserForReauthenticationFunction() {}
+  virtual ~FileManagerPrivateLogoutUserForReauthenticationFunction() {}
 
   // SyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.getPreferences method.
+// Implements the chrome.fileManagerPrivate.getPreferences method.
 // Gets settings for Files.app.
-class FileBrowserPrivateGetPreferencesFunction
+class FileManagerPrivateGetPreferencesFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getPreferences",
-                             FILEBROWSERPRIVATE_GETPREFERENCES)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getPreferences",
+                             FILEMANAGERPRIVATE_GETPREFERENCES)
 
  protected:
-  virtual ~FileBrowserPrivateGetPreferencesFunction() {}
+  virtual ~FileManagerPrivateGetPreferencesFunction() {}
 
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.setPreferences method.
+// Implements the chrome.fileManagerPrivate.setPreferences method.
 // Sets settings for Files.app.
-class FileBrowserPrivateSetPreferencesFunction
+class FileManagerPrivateSetPreferencesFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.setPreferences",
-                             FILEBROWSERPRIVATE_SETPREFERENCES)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.setPreferences",
+                             FILEMANAGERPRIVATE_SETPREFERENCES)
 
  protected:
-  virtual ~FileBrowserPrivateSetPreferencesFunction() {}
+  virtual ~FileManagerPrivateSetPreferencesFunction() {}
 
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.zipSelection method.
+// Implements the chrome.fileManagerPrivate.zipSelection method.
 // Creates a zip file for the selected files.
-class FileBrowserPrivateZipSelectionFunction
+class FileManagerPrivateZipSelectionFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.zipSelection",
-                             FILEBROWSERPRIVATE_ZIPSELECTION)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.zipSelection",
+                             FILEMANAGERPRIVATE_ZIPSELECTION)
 
-  FileBrowserPrivateZipSelectionFunction();
+  FileManagerPrivateZipSelectionFunction();
 
  protected:
-  virtual ~FileBrowserPrivateZipSelectionFunction();
+  virtual ~FileManagerPrivateZipSelectionFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -81,31 +81,31 @@ class FileBrowserPrivateZipSelectionFunction
   void OnZipDone(bool success);
 };
 
-// Implements the chrome.fileBrowserPrivate.zoom method.
+// Implements the chrome.fileManagerPrivate.zoom method.
 // Changes the zoom level of the file manager by internally calling
 // RenderViewHost::Zoom(). TODO(hirono): Remove this function once the zoom
 // level change is supported for all apps. crbug.com/227175.
-class FileBrowserPrivateZoomFunction : public ChromeSyncExtensionFunction {
+class FileManagerPrivateZoomFunction : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.zoom",
-                             FILEBROWSERPRIVATE_ZOOM);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.zoom",
+                             FILEMANAGERPRIVATE_ZOOM);
 
  protected:
-  virtual ~FileBrowserPrivateZoomFunction() {}
+  virtual ~FileManagerPrivateZoomFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.installWebstoreItem method.
-class FileBrowserPrivateInstallWebstoreItemFunction
+// Implements the chrome.fileManagerPrivate.installWebstoreItem method.
+class FileManagerPrivateInstallWebstoreItemFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.installWebstoreItem",
-                             FILEBROWSERPRIVATE_INSTALLWEBSTOREITEM);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.installWebstoreItem",
+                             FILEMANAGERPRIVATE_INSTALLWEBSTOREITEM);
 
  protected:
-  virtual ~FileBrowserPrivateInstallWebstoreItemFunction() {}
+  virtual ~FileManagerPrivateInstallWebstoreItemFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -117,16 +117,16 @@ class FileBrowserPrivateInstallWebstoreItemFunction
   std::string webstore_item_id_;
 };
 
-class FileBrowserPrivateRequestWebStoreAccessTokenFunction
+class FileManagerPrivateRequestWebStoreAccessTokenFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.requestWebStoreAccessToken",
-                             FILEBROWSERPRIVATE_REQUESTWEBSTOREACCESSTOKEN);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.requestWebStoreAccessToken",
+                             FILEMANAGERPRIVATE_REQUESTWEBSTOREACCESSTOKEN);
 
-  FileBrowserPrivateRequestWebStoreAccessTokenFunction();
+  FileManagerPrivateRequestWebStoreAccessTokenFunction();
 
  protected:
-  virtual ~FileBrowserPrivateRequestWebStoreAccessTokenFunction();
+  virtual ~FileManagerPrivateRequestWebStoreAccessTokenFunction();
   virtual bool RunAsync() OVERRIDE;
 
  private:
@@ -137,41 +137,41 @@ class FileBrowserPrivateRequestWebStoreAccessTokenFunction
 
 };
 
-class FileBrowserPrivateGetProfilesFunction
+class FileManagerPrivateGetProfilesFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getProfiles",
-                             FILEBROWSERPRIVATE_GETPROFILES);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getProfiles",
+                             FILEMANAGERPRIVATE_GETPROFILES);
 
  protected:
-  virtual ~FileBrowserPrivateGetProfilesFunction() {}
+  virtual ~FileManagerPrivateGetProfilesFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
 };
 
-class FileBrowserPrivateVisitDesktopFunction
+class FileManagerPrivateVisitDesktopFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.visitDesktop",
-                             FILEBROWSERPRIVATE_VISITDESKTOP);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.visitDesktop",
+                             FILEMANAGERPRIVATE_VISITDESKTOP);
 
  protected:
-  virtual ~FileBrowserPrivateVisitDesktopFunction() {}
+  virtual ~FileManagerPrivateVisitDesktopFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
 };
 
-// Implements the chrome.fileBrowserPrivate.openInspector method.
-class FileBrowserPrivateOpenInspectorFunction
+// Implements the chrome.fileManagerPrivate.openInspector method.
+class FileManagerPrivateOpenInspectorFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.openInspector",
-                             FILEBROWSERPRIVATE_OPENINSPECTOR);
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.openInspector",
+                             FILEMANAGERPRIVATE_OPENINSPECTOR);
 
  protected:
-  virtual ~FileBrowserPrivateOpenInspectorFunction() {}
+  virtual ~FileManagerPrivateOpenInspectorFunction() {}
 
   virtual bool RunSync() OVERRIDE;
 };
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
index fb30207..a8b4fd1 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/drive/event_logger.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "google_apis/drive/task_util.h"
@@ -23,7 +23,7 @@
 
 using chromeos::disks::DiskMountManager;
 using content::BrowserThread;
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
 
 namespace extensions {
 
@@ -45,8 +45,8 @@ void EnsureReadableFilePermissionOnBlockingPool(
 
 }  // namespace
 
-bool FileBrowserPrivateAddMountFunction::RunAsync() {
-  using file_browser_private::AddMount::Params;
+bool FileManagerPrivateAddMountFunction::RunAsync() {
+  using file_manager_private::AddMount::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -76,7 +76,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() {
     file_system->MarkCacheFileAsMounted(
         drive::util::ExtractDrivePath(path),
         base::Bind(
-            &FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted,
+            &FileManagerPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted,
             this, path.BaseName()));
   } else {
     file_manager::VolumeManager* volume_manager =
@@ -102,7 +102,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() {
           base::Bind(&EnsureReadableFilePermissionOnBlockingPool,
                      path,
                      google_apis::CreateRelayCallback(
-                         base::Bind(&FileBrowserPrivateAddMountFunction::
+                         base::Bind(&FileManagerPrivateAddMountFunction::
                                         RunAfterMarkCacheFileAsMounted,
                                     this,
                                     path.BaseName()))));
@@ -114,7 +114,7 @@ bool FileBrowserPrivateAddMountFunction::RunAsync() {
   return true;
 }
 
-void FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted(
+void FileManagerPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted(
     const base::FilePath& display_name,
     drive::FileError error,
     const base::FilePath& file_path) {
@@ -138,8 +138,8 @@ void FileBrowserPrivateAddMountFunction::RunAfterMarkCacheFileAsMounted(
       chromeos::MOUNT_TYPE_ARCHIVE);
 }
 
-bool FileBrowserPrivateRemoveMountFunction::RunAsync() {
-  using file_browser_private::RemoveMount::Params;
+bool FileManagerPrivateRemoveMountFunction::RunAsync() {
+  using file_manager_private::RemoveMount::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -194,7 +194,7 @@ bool FileBrowserPrivateRemoveMountFunction::RunAsync() {
   return true;
 }
 
-bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() {
+bool FileManagerPrivateGetVolumeMetadataListFunction::RunAsync() {
   if (args_->GetSize())
     return false;
 
@@ -202,10 +202,10 @@ bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() {
       file_manager::VolumeManager::Get(GetProfile())->GetVolumeInfoList();
 
   std::string log_string;
-  std::vector<linked_ptr<file_browser_private::VolumeMetadata> > result;
+  std::vector<linked_ptr<file_manager_private::VolumeMetadata> > result;
   for (size_t i = 0; i < volume_info_list.size(); ++i) {
-    linked_ptr<file_browser_private::VolumeMetadata> volume_metadata(
-        new file_browser_private::VolumeMetadata);
+    linked_ptr<file_manager_private::VolumeMetadata> volume_metadata(
+        new file_manager_private::VolumeMetadata);
     file_manager::util::VolumeInfoToVolumeMetadata(
         GetProfile(), volume_info_list[i], volume_metadata.get());
     result.push_back(volume_metadata);
@@ -223,7 +223,7 @@ bool FileBrowserPrivateGetVolumeMetadataListFunction::RunAsync() {
   }
 
   results_ =
-      file_browser_private::GetVolumeMetadataList::Results::Create(result);
+      file_manager_private::GetVolumeMetadataList::Results::Create(result);
   SendResponse(true);
   return true;
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
index 69c2d9d..f6f67e2 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.h
@@ -19,15 +19,15 @@ struct SelectedFileInfo;
 
 namespace extensions {
 
-// Implements chrome.fileBrowserPrivate.addMount method.
+// Implements chrome.fileManagerPrivate.addMount method.
 // Mounts removable devices and archive files.
-class FileBrowserPrivateAddMountFunction : public LoggedAsyncExtensionFunction {
+class FileManagerPrivateAddMountFunction : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.addMount",
-                             FILEBROWSERPRIVATE_ADDMOUNT)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.addMount",
+                             FILEMANAGERPRIVATE_ADDMOUNT)
 
  protected:
-  virtual ~FileBrowserPrivateAddMountFunction() {}
+  virtual ~FileManagerPrivateAddMountFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -40,30 +40,30 @@ class FileBrowserPrivateAddMountFunction : public LoggedAsyncExtensionFunction {
                                       const base::FilePath& file_path);
 };
 
-// Implements chrome.fileBrowserPrivate.removeMount method.
+// Implements chrome.fileManagerPrivate.removeMount method.
 // Unmounts selected volume. Expects volume id as an argument.
-class FileBrowserPrivateRemoveMountFunction
+class FileManagerPrivateRemoveMountFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.removeMount",
-                             FILEBROWSERPRIVATE_REMOVEMOUNT)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.removeMount",
+                             FILEMANAGERPRIVATE_REMOVEMOUNT)
 
  protected:
-  virtual ~FileBrowserPrivateRemoveMountFunction() {}
+  virtual ~FileManagerPrivateRemoveMountFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 };
 
-// Implements chrome.fileBrowserPrivate.getVolumeMetadataList method.
-class FileBrowserPrivateGetVolumeMetadataListFunction
+// Implements chrome.fileManagerPrivate.getVolumeMetadataList method.
+class FileManagerPrivateGetVolumeMetadataListFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getVolumeMetadataList",
-                             FILEBROWSERPRIVATE_GETVOLUMEMETADATALIST)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getVolumeMetadataList",
+                             FILEMANAGERPRIVATE_GETVOLUMEMETADATALIST)
 
  protected:
-  virtual ~FileBrowserPrivateGetVolumeMetadataListFunction() {}
+  virtual ~FileManagerPrivateGetVolumeMetadataListFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc
index 0bfcb60..dd66fb9 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc
@@ -56,13 +56,13 @@ const int kNoActionForFileHelpNumber = 1700055;
 
 namespace extensions {
 
-FileBrowserPrivateGetStringsFunction::FileBrowserPrivateGetStringsFunction() {
+FileManagerPrivateGetStringsFunction::FileManagerPrivateGetStringsFunction() {
 }
 
-FileBrowserPrivateGetStringsFunction::~FileBrowserPrivateGetStringsFunction() {
+FileManagerPrivateGetStringsFunction::~FileManagerPrivateGetStringsFunction() {
 }
 
-bool FileBrowserPrivateGetStringsFunction::RunSync() {
+bool FileManagerPrivateGetStringsFunction::RunSync() {
   base::DictionaryValue* dict = new base::DictionaryValue();
   SetResult(dict);
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h
index dd06f17..c50589b 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.h
@@ -11,18 +11,18 @@
 
 namespace extensions {
 
-// Implements the chrome.fileBrowserPrivate.getStrings method.
+// Implements the chrome.fileManagerPrivate.getStrings method.
 // Used to get strings for the file manager from JavaScript.
-class FileBrowserPrivateGetStringsFunction
+class FileManagerPrivateGetStringsFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getStrings",
-                             FILEBROWSERPRIVATE_GETSTRINGS)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getStrings",
+                             FILEMANAGERPRIVATE_GETSTRINGS)
 
-  FileBrowserPrivateGetStringsFunction();
+  FileManagerPrivateGetStringsFunction();
 
  protected:
-  virtual ~FileBrowserPrivateGetStringsFunction();
+  virtual ~FileManagerPrivateGetStringsFunction();
 
   // SyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
index 9f5b46a..5c24f67 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
@@ -59,9 +59,9 @@ std::set<std::string> GetUniqueMimeTypes(
 
 }  // namespace
 
-bool FileBrowserPrivateExecuteTaskFunction::RunAsync() {
-  using extensions::api::file_browser_private::ExecuteTask::Params;
-  using extensions::api::file_browser_private::ExecuteTask::Results::Create;
+bool FileManagerPrivateExecuteTaskFunction::RunAsync() {
+  using extensions::api::file_manager_private::ExecuteTask::Params;
+  using extensions::api::file_manager_private::ExecuteTask::Results::Create;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -69,12 +69,12 @@ bool FileBrowserPrivateExecuteTaskFunction::RunAsync() {
   if (!file_manager::file_tasks::ParseTaskID(params->task_id, &task)) {
     SetError(kInvalidTask + params->task_id);
     results_ =
-        Create(extensions::api::file_browser_private::TASK_RESULT_FAILED);
+        Create(extensions::api::file_manager_private::TASK_RESULT_FAILED);
     return false;
   }
 
   if (params->file_urls.empty()) {
-    results_ = Create(extensions::api::file_browser_private::TASK_RESULT_EMPTY);
+    results_ = Create(extensions::api::file_manager_private::TASK_RESULT_EMPTY);
     SendResponse(true);
     return true;
   }
@@ -90,7 +90,7 @@ bool FileBrowserPrivateExecuteTaskFunction::RunAsync() {
     if (!chromeos::FileSystemBackend::CanHandleURL(url)) {
       SetError(kInvalidFileUrl);
       results_ =
-          Create(extensions::api::file_browser_private::TASK_RESULT_FAILED);
+          Create(extensions::api::file_manager_private::TASK_RESULT_FAILED);
       return false;
     }
     file_urls.push_back(url);
@@ -101,33 +101,33 @@ bool FileBrowserPrivateExecuteTaskFunction::RunAsync() {
       source_url(),
       task,
       file_urls,
-      base::Bind(&FileBrowserPrivateExecuteTaskFunction::OnTaskExecuted, this));
+      base::Bind(&FileManagerPrivateExecuteTaskFunction::OnTaskExecuted, this));
   if (!result) {
     results_ =
-        Create(extensions::api::file_browser_private::TASK_RESULT_FAILED);
+        Create(extensions::api::file_manager_private::TASK_RESULT_FAILED);
   }
   return result;
 }
 
-void FileBrowserPrivateExecuteTaskFunction::OnTaskExecuted(
-    extensions::api::file_browser_private::TaskResult result) {
+void FileManagerPrivateExecuteTaskFunction::OnTaskExecuted(
+    extensions::api::file_manager_private::TaskResult result) {
   results_ =
-      extensions::api::file_browser_private::ExecuteTask::Results::Create(
+      extensions::api::file_manager_private::ExecuteTask::Results::Create(
           result);
   SendResponse(result !=
-               extensions::api::file_browser_private::TASK_RESULT_FAILED);
+               extensions::api::file_manager_private::TASK_RESULT_FAILED);
 }
 
-FileBrowserPrivateGetFileTasksFunction::
-    FileBrowserPrivateGetFileTasksFunction() {
+FileManagerPrivateGetFileTasksFunction::
+    FileManagerPrivateGetFileTasksFunction() {
 }
 
-FileBrowserPrivateGetFileTasksFunction::
-    ~FileBrowserPrivateGetFileTasksFunction() {
+FileManagerPrivateGetFileTasksFunction::
+    ~FileManagerPrivateGetFileTasksFunction() {
 }
 
-bool FileBrowserPrivateGetFileTasksFunction::RunAsync() {
-  using extensions::api::file_browser_private::GetFileTasks::Params;
+bool FileManagerPrivateGetFileTasksFunction::RunAsync() {
+  using extensions::api::file_manager_private::GetFileTasks::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
@@ -153,13 +153,13 @@ bool FileBrowserPrivateGetFileTasksFunction::RunAsync() {
   collector_.reset(new app_file_handler_util::MimeTypeCollector(GetProfile()));
   collector_->CollectForLocalPaths(
       local_paths_,
-      base::Bind(&FileBrowserPrivateGetFileTasksFunction::OnMimeTypesCollected,
+      base::Bind(&FileManagerPrivateGetFileTasksFunction::OnMimeTypesCollected,
                  this));
 
   return true;
 }
 
-void FileBrowserPrivateGetFileTasksFunction::OnMimeTypesCollected(
+void FileManagerPrivateGetFileTasksFunction::OnMimeTypesCollected(
     scoped_ptr<std::vector<std::string> > mime_types) {
   app_file_handler_util::PathAndMimeTypeSet path_mime_set;
   for (size_t i = 0; i < local_paths_.size(); ++i) {
@@ -175,7 +175,7 @@ void FileBrowserPrivateGetFileTasksFunction::OnMimeTypesCollected(
       &tasks);
 
   // Convert the tasks into JSON compatible objects.
-  using api::file_browser_private::FileTask;
+  using api::file_manager_private::FileTask;
   std::vector<linked_ptr<FileTask> > results;
   for (size_t i = 0; i < tasks.size(); ++i) {
     const file_manager::file_tasks::FullTaskDescriptor& task = tasks[i];
@@ -189,13 +189,13 @@ void FileBrowserPrivateGetFileTasksFunction::OnMimeTypesCollected(
     results.push_back(converted);
   }
 
-  results_ = extensions::api::file_browser_private::GetFileTasks::Results::
+  results_ = extensions::api::file_manager_private::GetFileTasks::Results::
       Create(results);
   SendResponse(true);
 }
 
-bool FileBrowserPrivateSetDefaultTaskFunction::RunSync() {
-  using extensions::api::file_browser_private::SetDefaultTask::Params;
+bool FileManagerPrivateSetDefaultTaskFunction::RunSync() {
+  using extensions::api::file_manager_private::SetDefaultTask::Params;
   const scoped_ptr<Params> params(Params::Create(*args_));
   EXTENSION_FUNCTION_VALIDATE(params);
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
index f11bb86..04c37df 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.h
@@ -12,7 +12,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_base.h"
 #include "chrome/browser/chromeos/file_manager/file_tasks.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 
 namespace base {
 class FilePath;
@@ -24,35 +24,35 @@ namespace app_file_handler_util {
 class MimeTypeCollector;
 }  // namespace app_file_handler_util
 
-// Implements the chrome.fileBrowserPrivate.executeTask method.
-class FileBrowserPrivateExecuteTaskFunction
+// Implements the chrome.fileManagerPrivate.executeTask method.
+class FileManagerPrivateExecuteTaskFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.executeTask",
-                             FILEBROWSERPRIVATE_EXECUTETASK)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.executeTask",
+                             FILEMANAGERPRIVATE_EXECUTETASK)
 
  protected:
-  virtual ~FileBrowserPrivateExecuteTaskFunction() {}
+  virtual ~FileManagerPrivateExecuteTaskFunction() {}
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
 
  private:
   void OnTaskExecuted(
-      extensions::api::file_browser_private::TaskResult success);
+      extensions::api::file_manager_private::TaskResult success);
 };
 
-// Implements the chrome.fileBrowserPrivate.getFileTasks method.
-class FileBrowserPrivateGetFileTasksFunction
+// Implements the chrome.fileManagerPrivate.getFileTasks method.
+class FileManagerPrivateGetFileTasksFunction
     : public LoggedAsyncExtensionFunction {
  public:
-  FileBrowserPrivateGetFileTasksFunction();
+  FileManagerPrivateGetFileTasksFunction();
 
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.getFileTasks",
-                             FILEBROWSERPRIVATE_GETFILETASKS)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.getFileTasks",
+                             FILEMANAGERPRIVATE_GETFILETASKS)
 
  protected:
-  virtual ~FileBrowserPrivateGetFileTasksFunction();
+  virtual ~FileManagerPrivateGetFileTasksFunction();
 
   // AsyncExtensionFunction overrides.
   virtual bool RunAsync() OVERRIDE;
@@ -69,15 +69,15 @@ class FileBrowserPrivateGetFileTasksFunction
   std::vector<base::FilePath> local_paths_;
 };
 
-// Implements the chrome.fileBrowserPrivate.setDefaultTask method.
-class FileBrowserPrivateSetDefaultTaskFunction
+// Implements the chrome.fileManagerPrivate.setDefaultTask method.
+class FileManagerPrivateSetDefaultTaskFunction
     : public ChromeSyncExtensionFunction {
  public:
-  DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.setDefaultTask",
-                             FILEBROWSERPRIVATE_SETDEFAULTTASK)
+  DECLARE_EXTENSION_FUNCTION("fileManagerPrivate.setDefaultTask",
+                             FILEMANAGERPRIVATE_SETDEFAULTTASK)
 
  protected:
-  virtual ~FileBrowserPrivateSetDefaultTaskFunction() {}
+  virtual ~FileManagerPrivateSetDefaultTaskFunction() {}
 
   // SyncExtensionFunction overrides.
   virtual bool RunSync() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
index 4cae82a1..f577e06 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.cc
@@ -21,13 +21,13 @@
 #include "chrome/browser/chromeos/file_manager/volume_manager.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 
-namespace file_browser_private = extensions::api::file_browser_private;
+namespace file_manager_private = extensions::api::file_manager_private;
 
 namespace file_manager {
 namespace util {
@@ -159,7 +159,7 @@ void ContinueGetSelectedFileInfo(Profile* profile,
 void VolumeInfoToVolumeMetadata(
     Profile* profile,
     const VolumeInfo& volume_info,
-    file_browser_private::VolumeMetadata* volume_metadata) {
+    file_manager_private::VolumeMetadata* volume_metadata) {
   DCHECK(volume_metadata);
 
   volume_metadata->volume_id = volume_info.volume_id;
@@ -188,32 +188,32 @@ void VolumeInfoToVolumeMetadata(
   switch (volume_info.type) {
     case VOLUME_TYPE_GOOGLE_DRIVE:
       volume_metadata->volume_type =
-          file_browser_private::VOLUME_TYPE_DRIVE;
+          file_manager_private::VOLUME_TYPE_DRIVE;
       break;
     case VOLUME_TYPE_DOWNLOADS_DIRECTORY:
       volume_metadata->volume_type =
-          file_browser_private::VOLUME_TYPE_DOWNLOADS;
+          file_manager_private::VOLUME_TYPE_DOWNLOADS;
       break;
     case VOLUME_TYPE_REMOVABLE_DISK_PARTITION:
       volume_metadata->volume_type =
-          file_browser_private::VOLUME_TYPE_REMOVABLE;
+          file_manager_private::VOLUME_TYPE_REMOVABLE;
       break;
     case VOLUME_TYPE_MOUNTED_ARCHIVE_FILE:
-      volume_metadata->volume_type = file_browser_private::VOLUME_TYPE_ARCHIVE;
+      volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_ARCHIVE;
       break;
     case VOLUME_TYPE_CLOUD_DEVICE:
       volume_metadata->volume_type =
-          file_browser_private::VOLUME_TYPE_CLOUD_DEVICE;
+          file_manager_private::VOLUME_TYPE_CLOUD_DEVICE;
       break;
     case VOLUME_TYPE_PROVIDED:
-      volume_metadata->volume_type = file_browser_private::VOLUME_TYPE_PROVIDED;
+      volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_PROVIDED;
       break;
     case VOLUME_TYPE_MTP:
-      volume_metadata->volume_type = file_browser_private::VOLUME_TYPE_MTP;
+      volume_metadata->volume_type = file_manager_private::VOLUME_TYPE_MTP;
       break;
     case VOLUME_TYPE_TESTING:
       volume_metadata->volume_type =
-          file_browser_private::VOLUME_TYPE_TESTING;
+          file_manager_private::VOLUME_TYPE_TESTING;
       break;
     case NUM_VOLUME_TYPE:
       NOTREACHED();
@@ -225,21 +225,21 @@ void VolumeInfoToVolumeMetadata(
     switch (volume_info.device_type) {
       case chromeos::DEVICE_TYPE_UNKNOWN:
         volume_metadata->device_type =
-            file_browser_private::DEVICE_TYPE_UNKNOWN;
+            file_manager_private::DEVICE_TYPE_UNKNOWN;
         break;
       case chromeos::DEVICE_TYPE_USB:
-        volume_metadata->device_type = file_browser_private::DEVICE_TYPE_USB;
+        volume_metadata->device_type = file_manager_private::DEVICE_TYPE_USB;
         break;
       case chromeos::DEVICE_TYPE_SD:
-        volume_metadata->device_type = file_browser_private::DEVICE_TYPE_SD;
+        volume_metadata->device_type = file_manager_private::DEVICE_TYPE_SD;
         break;
       case chromeos::DEVICE_TYPE_OPTICAL_DISC:
       case chromeos::DEVICE_TYPE_DVD:
         volume_metadata->device_type =
-            file_browser_private::DEVICE_TYPE_OPTICAL;
+            file_manager_private::DEVICE_TYPE_OPTICAL;
         break;
       case chromeos::DEVICE_TYPE_MOBILE:
-        volume_metadata->device_type = file_browser_private::DEVICE_TYPE_MOBILE;
+        volume_metadata->device_type = file_manager_private::DEVICE_TYPE_MOBILE;
         break;
     }
     volume_metadata->device_path.reset(
@@ -248,7 +248,7 @@ void VolumeInfoToVolumeMetadata(
         new bool(volume_info.is_parent));
   } else {
     volume_metadata->device_type =
-        file_browser_private::DEVICE_TYPE_NONE;
+        file_manager_private::DEVICE_TYPE_NONE;
   }
 
   volume_metadata->is_read_only = volume_info.is_read_only;
@@ -256,15 +256,15 @@ void VolumeInfoToVolumeMetadata(
   switch (volume_info.mount_condition) {
     case chromeos::disks::MOUNT_CONDITION_NONE:
       volume_metadata->mount_condition =
-          file_browser_private::MOUNT_CONDITION_NONE;
+          file_manager_private::MOUNT_CONDITION_NONE;
       break;
     case chromeos::disks::MOUNT_CONDITION_UNKNOWN_FILESYSTEM:
       volume_metadata->mount_condition =
-          file_browser_private::MOUNT_CONDITION_UNKNOWN;
+          file_manager_private::MOUNT_CONDITION_UNKNOWN;
       break;
     case chromeos::disks::MOUNT_CONDITION_UNSUPPORTED_FILESYSTEM:
       volume_metadata->mount_condition =
-          file_browser_private::MOUNT_CONDITION_UNSUPPORTED;
+          file_manager_private::MOUNT_CONDITION_UNSUPPORTED;
       break;
   }
 }
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_util.h b/chrome/browser/chromeos/extensions/file_manager/private_api_util.h
index 8af7b27..465c005 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_util.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// This file provides utility functions for fileBrowserPrivate API.
+// This file provides utility functions for fileManagerPrivate API.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_UTIL_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_PRIVATE_API_UTIL_H_
@@ -28,7 +28,7 @@ class EventLogger;
 
 namespace extensions {
 namespace api {
-namespace file_browser_private {
+namespace file_manager_private {
 struct VolumeMetadata;
 }
 }
@@ -49,7 +49,7 @@ namespace util {
 void VolumeInfoToVolumeMetadata(
     Profile* profile,
     const VolumeInfo& volume_info,
-    extensions::api::file_browser_private::VolumeMetadata* volume_metadata);
+    extensions::api::file_manager_private::VolumeMetadata* volume_metadata);
 
 // Returns the local FilePath associated with |url|. If the file isn't of the
 // type FileSystemBackend handles, returns an empty
diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
index 9d58b1ed..2f03bfe 100644
--- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc
@@ -32,27 +32,27 @@
 
 // Tests for access to external file systems (as defined in
 // storage/common/fileapi/file_system_types.h) from extensions with
-// fileBrowserPrivate and fileBrowserHandler extension permissions.
+// fileManagerPrivate and fileBrowserHandler extension permissions.
 // The tests cover following external file system types:
 // - local (kFileSystemTypeLocalNative): a local file system on which files are
 //   accessed using native local path.
 // - restricted (kFileSystemTypeRestrictedLocalNative): a *read-only* local file
 //   system which can only be accessed by extensions that have full access to
-//   external file systems (i.e. extensions with fileBrowserPrivate permission).
+//   external file systems (i.e. extensions with fileManagerPrivate permission).
 // - drive (kFileSystemTypeDrive): a file system that provides access to Google
 //   Drive.
 //
 // The tests cover following scenarios:
 // - Performing file system operations on external file systems from an
-//   extension with fileBrowserPrivate permission (i.e. a file browser
+//   extension with fileManagerPrivate permission (i.e. a file browser
 //   extension).
 // - Performing read/write operations from file handler extensions. These
 //   extensions need a file browser extension to give them permissions to access
 //   files. This also includes file handler extensions in filesystem API.
 // - Observing directory changes from a file browser extension (using
-//   fileBrowserPrivate API).
+//   fileManagerPrivate API).
 // - Doing searches on drive file system from file browser extension (using
-//   fileBrowserPrivate API).
+//   fileManagerPrivate API).
 
 using drive::DriveIntegrationServiceFactory;
 using extensions::Extension;
diff --git a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
index 8f5fac8..e7d2e2a 100644
--- a/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
+++ b/chrome/browser/chromeos/file_manager/file_browser_handlers.cc
@@ -18,7 +18,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
@@ -303,8 +303,8 @@ void FileBrowserHandlerExecutor::ExecuteDoneOnUIThread(bool success) {
   if (!done_.is_null())
     done_.Run(
         success
-            ? extensions::api::file_browser_private::TASK_RESULT_MESSAGE_SENT
-            : extensions::api::file_browser_private::TASK_RESULT_FAILED);
+            ? extensions::api::file_manager_private::TASK_RESULT_MESSAGE_SENT
+            : extensions::api::file_manager_private::TASK_RESULT_FAILED);
   delete this;
 }
 
@@ -473,7 +473,7 @@ bool ExecuteFileBrowserHandler(
   if (ShouldBeOpenedWithBrowser(extension->id(), action_id)) {
     const bool result = OpenFilesWithBrowser(profile, file_urls);
     if (result && !done.is_null())
-      done.Run(extensions::api::file_browser_private::TASK_RESULT_OPENED);
+      done.Run(extensions::api::file_manager_private::TASK_RESULT_OPENED);
     return result;
   }
 
diff --git a/chrome/browser/chromeos/file_manager/file_tasks.cc b/chrome/browser/chromeos/file_manager/file_tasks.cc
index e4184b5..a8f0d7e 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks.cc
+++ b/chrome/browser/chromeos/file_manager/file_tasks.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
 #include "chrome/common/extensions/api/file_browser_handlers/file_browser_handler.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/pref_names.h"
 #include "extensions/browser/extension_host.h"
@@ -285,7 +285,7 @@ bool ExecuteFileTask(Profile* profile,
     apps::LaunchPlatformAppWithFileHandler(
         profile, extension, task.action_id, paths);
     if (!done.is_null())
-      done.Run(extensions::api::file_browser_private::TASK_RESULT_MESSAGE_SENT);
+      done.Run(extensions::api::file_manager_private::TASK_RESULT_MESSAGE_SENT);
     return true;
   }
   NOTREACHED();
diff --git a/chrome/browser/chromeos/file_manager/file_tasks.h b/chrome/browser/chromeos/file_manager/file_tasks.h
index c5667c1..5f88d98 100644
--- a/chrome/browser/chromeos/file_manager/file_tasks.h
+++ b/chrome/browser/chromeos/file_manager/file_tasks.h
@@ -34,7 +34,7 @@
 //
 // For example, if the user is now selecting a JPEG file, Files.app will
 // receive file tasks represented as a JSON object via
-// chrome.fileBrowserPrivate.getFileTasks() API, which look like:
+// chrome.fileManagerPrivate.getFileTasks() API, which look like:
 //
 // [
 //   {
@@ -93,10 +93,10 @@
 //
 // HOW TASKS ARE EXECUTED?
 //
-// chrome.fileBrowserPrivate.viewFiles() is used to open a file in a browser,
+// chrome.fileManagerPrivate.viewFiles() is used to open a file in a browser,
 // without any handler. Browser will take care of handling the file (ex. PDF).
 //
-// chrome.fileBrowserPrivate.executeTasks() is used to open a file with a
+// chrome.fileManagerPrivate.executeTasks() is used to open a file with a
 // handler (Chrome Extension/App or Drive App).
 //
 // Some built-in handlers such as "play" are handled internally in Files.app.
@@ -117,7 +117,7 @@
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "chrome/browser/extensions/api/file_handlers/app_file_handler_util.h"
-#include "chrome/common/extensions/api/file_browser_private.h"
+#include "chrome/common/extensions/api/file_manager_private.h"
 #include "url/gurl.h"
 
 class PrefService;
@@ -222,7 +222,7 @@ bool ParseTaskID(const std::string& task_id, TaskDescriptor* task);
 
 // The callback is used for ExecuteFileTask(). Will be called with true if
 // the file task execution is successful, or false if unsuccessful.
-typedef base::Callback<void(extensions::api::file_browser_private::TaskResult
+typedef base::Callback<void(extensions::api::file_manager_private::TaskResult
                                 result)> FileTaskFinishedCallback;
 
 // Executes file handler task for each element of |file_urls|.
diff --git a/chrome/browser/chromeos/file_system_provider/operations/unmount.h b/chrome/browser/chromeos/file_system_provider/operations/unmount.h
index 6ac8195..11dd5a3 100644
--- a/chrome/browser/chromeos/file_system_provider/operations/unmount.h
+++ b/chrome/browser/chromeos/file_system_provider/operations/unmount.h
@@ -25,7 +25,7 @@ class ProvidedFileSystemInfo;
 
 namespace operations {
 
-// Bridge between fileBrowserPrivate's unmount operation and providing
+// Bridge between fileManagerPrivate's unmount operation and providing
 // extension's unmount request. Created per request.
 class Unmount : public Operation {
  public:
diff --git a/chrome/browser/extensions/browser_context_keyed_service_factories.cc b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
index f3a93188..e193c36 100644
--- a/chrome/browser/extensions/browser_context_keyed_service_factories.cc
+++ b/chrome/browser/extensions/browser_context_keyed_service_factories.cc
@@ -66,7 +66,7 @@
 #include "extensions/browser/api/usb/usb_device_resource.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h"
+#include "chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h"
 #include "chrome/browser/chromeos/extensions/input_method_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/extensions/api/input_ime/input_ime_api.h"
@@ -157,7 +157,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::WebrtcAudioPrivateEventService::GetFactoryInstance();
   extensions::WebstoreAPI::GetFactoryInstance();
 #if defined(OS_CHROMEOS)
-  file_manager::FileBrowserPrivateAPIFactory::GetInstance();
+  file_manager::FileManagerPrivateAPIFactory::GetInstance();
 #endif
   TokenCacheServiceFactory::GetInstance();
   extensions::ExtensionGCMAppHandler::GetFactoryInstance();
diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi
index 04acba1..c16c002 100644
--- a/chrome/chrome_browser_chromeos.gypi
+++ b/chrome/chrome_browser_chromeos.gypi
@@ -1051,11 +1051,11 @@
             'browser/chromeos/extensions/file_manager/event_router.h',
             'browser/chromeos/extensions/file_manager/file_browser_handler_api.cc',
             'browser/chromeos/extensions/file_manager/file_browser_handler_api.h',
-            'browser/chromeos/extensions/file_manager/file_browser_private_api.cc',
-            'browser/chromeos/extensions/file_manager/file_browser_private_api.h',
-            'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.cc',
-            'browser/chromeos/extensions/file_manager/file_browser_private_api_factory.h',
-            'browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h',
+            'browser/chromeos/extensions/file_manager/file_manager_private_api.cc',
+            'browser/chromeos/extensions/file_manager/file_manager_private_api.h',
+            'browser/chromeos/extensions/file_manager/file_manager_private_api_factory.cc',
+            'browser/chromeos/extensions/file_manager/file_manager_private_api_factory.h',
+            'browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h',
             'browser/chromeos/extensions/file_manager/private_api_base.cc',
             'browser/chromeos/extensions/file_manager/private_api_base.h',
             'browser/chromeos/extensions/file_manager/private_api_dialog.cc',
diff --git a/chrome/chrome_renderer.gypi b/chrome/chrome_renderer.gypi
index b5e9362..6176b2f 100644
--- a/chrome/chrome_renderer.gypi
+++ b/chrome/chrome_renderer.gypi
@@ -133,8 +133,8 @@
       'renderer/extensions/enterprise_platform_keys_natives.h',
       'renderer/extensions/file_browser_handler_custom_bindings.cc',
       'renderer/extensions/file_browser_handler_custom_bindings.h',
-      'renderer/extensions/file_browser_private_custom_bindings.cc',
-      'renderer/extensions/file_browser_private_custom_bindings.h',
+      'renderer/extensions/file_manager_private_custom_bindings.cc',
+      'renderer/extensions/file_manager_private_custom_bindings.h',
       'renderer/extensions/media_galleries_custom_bindings.cc',
       'renderer/extensions/media_galleries_custom_bindings.h',
       'renderer/extensions/notifications_native_handler.cc',
@@ -160,8 +160,8 @@
       'renderer/resources/extensions/extension_options.js',
       'renderer/resources/extensions/feedback_private_custom_bindings.js',
       'renderer/resources/extensions/file_browser_handler_custom_bindings.js',
-      'renderer/resources/extensions/file_browser_private_custom_bindings.js',
       'renderer/resources/extensions/file_entry_binding_util.js',
+      'renderer/resources/extensions/file_manager_private_custom_bindings.js',
       'renderer/resources/extensions/file_system_custom_bindings.js',
       'renderer/resources/extensions/file_system_provider_custom_bindings.js',
       'renderer/resources/extensions/gcm_custom_bindings.js',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f0b8b6a..d69881d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -948,7 +948,7 @@
         'browser/chromeos/extensions/accessibility_features_apitest.cc',
         'browser/chromeos/extensions/echo_private_apitest.cc',
         'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc',
-        'browser/chromeos/extensions/file_manager/file_browser_private_apitest.cc',
+        'browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc',
         'browser/chromeos/extensions/file_system_provider/file_system_provider_apitest.cc',
         'browser/chromeos/extensions/info_private_apitest.cc',
         'browser/chromeos/extensions/input_method_apitest_chromeos.cc',
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index 602b407..a9f2ccf 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -413,13 +413,13 @@
     "extension_types": ["platform_app"],
     "contexts": ["blessed_extension", "unblessed_extension"]
   },
-  "fileBrowserPrivate": {
-    "dependencies": ["permission:fileBrowserPrivate"],
+  "fileManagerPrivate": {
+    "dependencies": ["permission:fileManagerPrivate"],
     "contexts": ["blessed_extension"]
   },
-  "fileBrowserPrivateInternal": {
+  "fileManagerPrivateInternal": {
     "internal": true,
-    "dependencies": ["permission:fileBrowserPrivate"],
+    "dependencies": ["permission:fileManagerPrivate"],
     "contexts": ["blessed_extension"]
   },
   "fileSystem": {
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index 713a82e..f3eadf5 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -513,7 +513,7 @@
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "platforms": ["chromeos"]
   },
-  "fileBrowserPrivate": {
+  "fileManagerPrivate": {
     "channel": "stable",
     "extension_types": ["extension", "legacy_packaged_app", "platform_app"],
     "location": "component",
diff --git a/chrome/common/extensions/api/file_browser_private.idl b/chrome/common/extensions/api/file_manager_private.idl
index 89add15..3ee6df5 100644
--- a/chrome/common/extensions/api/file_browser_private.idl
+++ b/chrome/common/extensions/api/file_manager_private.idl
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// fileBrowserPrivate API.
+// fileManagerPrivate API.
 // This is a private API used by the file browser of ChromeOS.
 [platforms=("chromeos"),
- implemented_in="chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h"]
-namespace fileBrowserPrivate {
+ implemented_in="chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h"]
+namespace fileManagerPrivate {
 // Type of the mounted volume.
 enum VolumeType { drive, downloads, removable, archive, cloud_device, provided,
                   mtp, testing };
diff --git a/chrome/common/extensions/api/file_browser_private_internal.idl b/chrome/common/extensions/api/file_manager_private_internal.idl
index d5a592e..a6ba6ec 100644
--- a/chrome/common/extensions/api/file_browser_private_internal.idl
+++ b/chrome/common/extensions/api/file_manager_private_internal.idl
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Internal, used by fileBrowserPrivate's custom bindings.
+// Internal, used by fileManagerPrivate's custom bindings.
 [platforms=("chromeos"),
- implemented_in="chrome/browser/chromeos/extensions/file_manager/file_browser_private_api_functions.h"]
-namespace fileBrowserPrivateInternal {
+ implemented_in="chrome/browser/chromeos/extensions/file_manager/file_manager_private_api_functions.h"]
+namespace fileManagerPrivateInternal {
   // Entry information that renderers need to create an Entry instance.
   dictionary EntryDescription {
     DOMString fileSystemName;
diff --git a/chrome/common/extensions/api/schemas.gypi b/chrome/common/extensions/api/schemas.gypi
index 788bfcd..9c4c433 100644
--- a/chrome/common/extensions/api/schemas.gypi
+++ b/chrome/common/extensions/api/schemas.gypi
@@ -48,8 +48,8 @@
       'experience_sampling_private.json',
       'extension_options_internal.idl',
       'feedback_private.idl',
-      'file_browser_private.idl',
-      'file_browser_private_internal.idl',
+      'file_manager_private.idl',
+      'file_manager_private_internal.idl',
       'file_system.idl',
       'file_system_provider.idl',
       'file_system_provider_internal.idl',
diff --git a/chrome/common/extensions/docs/server2/known_broken_links.json b/chrome/common/extensions/docs/server2/known_broken_links.json
index 3782791..dd3e6a3 100644
--- a/chrome/common/extensions/docs/server2/known_broken_links.json
+++ b/chrome/common/extensions/docs/server2/known_broken_links.json
@@ -912,7 +912,7 @@
   [
     404,
     "apps/private_apis.html",
-    "apps/fileBrowserPrivate.html",
+    "apps/fileManagerPrivate.html",
     "target page not found"
   ],
   [
@@ -1763,7 +1763,7 @@
   [
     404,
     "extensions/private_apis.html",
-    "extensions/fileBrowserPrivate.html",
+    "extensions/fileManagerPrivate.html",
     "target page not found"
   ],
   [
diff --git a/chrome/common/extensions/docs/server2/test_data/file_system/stat b/chrome/common/extensions/docs/server2/test_data/file_system/stat
index eeb1405..6efea24 100644
--- a/chrome/common/extensions/docs/server2/test_data/file_system/stat
+++ b/chrome/common/extensions/docs/server2/test_data/file_system/stat
@@ -1400,16 +1400,16 @@ file_browser_handler_internal.json</a>
 <tr class="vc_row_even">
 <td colspan="2">
 
-<a name="file_browser_private.json" href="/viewvc/chrome/trunk/src/chrome/common/extensions/api/file_browser_private.json?view=log" title="View file revision log">
+<a name="file_manager_private.json" href="/viewvc/chrome/trunk/src/chrome/common/extensions/api/file_manager_private.json?view=log" title="View file revision log">
 
 <img src="/viewvc/*docroot*/images/text.png" alt="" width="16" height="16" />
-file_browser_private.json</a>
+file_manager_private.json</a>
 
 </td>
 
 
 
-<td>&nbsp;<a href="/viewvc/chrome/trunk/src/chrome/common/extensions/api/file_browser_private.json?revision=150806&amp;view=markup" title="View file contents"><strong>150806</strong></a></td>
+<td>&nbsp;<a href="/viewvc/chrome/trunk/src/chrome/common/extensions/api/file_manager_private.json?revision=150806&amp;view=markup" title="View file contents"><strong>150806</strong></a></td>
 
 <td>&nbsp;30 hours</td>
 <td>&nbsp;yoshiki@chromium.org</td>
diff --git a/chrome/common/extensions/docs/server2/test_data/file_system/stat_result.json b/chrome/common/extensions/docs/server2/test_data/file_system/stat_result.json
index 3e85bb2..0c5d79d9 100644
--- a/chrome/common/extensions/docs/server2/test_data/file_system/stat_result.json
+++ b/chrome/common/extensions/docs/server2/test_data/file_system/stat_result.json
@@ -69,7 +69,7 @@
   "webstore_private.json": "150455",
   "extension.json": "146855",
   "extension_api.cc": "149819",
-  "file_browser_private.json": "150806",
+  "file_manager_private.json": "150806",
   "cloud_print_private.json": "149303",
   "omnibox.json": "124878",
   "processes.json": "137690",
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
index 3acc16d..84ff77a 100644
--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc
+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -199,7 +199,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
        PermissionMessage::kExperienceSamplingPrivate},
       {APIPermission::kFileBrowserHandlerInternal, "fileBrowserHandlerInternal",
        APIPermissionInfo::kFlagCannotBeOptional},
-      {APIPermission::kFileBrowserPrivate, "fileBrowserPrivate",
+      {APIPermission::kFileManagerPrivate, "fileManagerPrivate",
        APIPermissionInfo::kFlagCannotBeOptional},
       {APIPermission::kHotwordPrivate, "hotwordPrivate",
        APIPermissionInfo::kFlagCannotBeOptional},
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
index 9a25dca..70c5f68 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -730,7 +730,7 @@ TEST(PermissionsTest, PermissionMessages) {
   skip.insert(APIPermission::kEnterprisePlatformKeysPrivate);
   skip.insert(APIPermission::kFeedbackPrivate);
   skip.insert(APIPermission::kFileBrowserHandlerInternal);
-  skip.insert(APIPermission::kFileBrowserPrivate);
+  skip.insert(APIPermission::kFileManagerPrivate);
   skip.insert(APIPermission::kFirstRunPrivate);
   skip.insert(APIPermission::kGcdPrivate);
   skip.insert(APIPermission::kHotwordPrivate);
diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
index c01edba..950d26e 100644
--- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
+++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc
@@ -18,7 +18,7 @@
 #include "chrome/renderer/extensions/chrome_v8_context.h"
 #include "chrome/renderer/extensions/enterprise_platform_keys_natives.h"
 #include "chrome/renderer/extensions/file_browser_handler_custom_bindings.h"
-#include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"
+#include "chrome/renderer/extensions/file_manager_private_custom_bindings.h"
 #include "chrome/renderer/extensions/media_galleries_custom_bindings.h"
 #include "chrome/renderer/extensions/notifications_native_handler.h"
 #include "chrome/renderer/extensions/page_capture_custom_bindings.h"
@@ -116,9 +116,9 @@ void ChromeExtensionsDispatcherDelegate::RegisterNativeHandlers(
       scoped_ptr<NativeHandler>(
           new extensions::FileBrowserHandlerCustomBindings(context)));
   module_system->RegisterNativeHandler(
-      "file_browser_private",
+      "file_manager_private",
       scoped_ptr<NativeHandler>(
-          new extensions::FileBrowserPrivateCustomBindings(context)));
+          new extensions::FileManagerPrivateCustomBindings(context)));
   module_system->RegisterNativeHandler(
       "notifications_private",
       scoped_ptr<NativeHandler>(
@@ -185,8 +185,8 @@ void ChromeExtensionsDispatcherDelegate::PopulateSourceMap(
                              IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("fileBrowserHandler",
                              IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS);
-  source_map->RegisterSource("fileBrowserPrivate",
-                             IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS);
+  source_map->RegisterSource("fileManagerPrivate",
+                             IDR_FILE_MANAGER_PRIVATE_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("fileSystem", IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS);
   source_map->RegisterSource("fileSystemProvider",
                              IDR_FILE_SYSTEM_PROVIDER_CUSTOM_BINDINGS_JS);
diff --git a/chrome/renderer/extensions/file_browser_private_custom_bindings.cc b/chrome/renderer/extensions/file_manager_private_custom_bindings.cc
index ff65c93..7db65bb 100644
--- a/chrome/renderer/extensions/file_browser_private_custom_bindings.cc
+++ b/chrome/renderer/extensions/file_manager_private_custom_bindings.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/renderer/extensions/file_browser_private_custom_bindings.h"
+#include "chrome/renderer/extensions/file_manager_private_custom_bindings.h"
 
 #include <string>
 
@@ -16,16 +16,16 @@
 
 namespace extensions {
 
-FileBrowserPrivateCustomBindings::FileBrowserPrivateCustomBindings(
+FileManagerPrivateCustomBindings::FileManagerPrivateCustomBindings(
     ScriptContext* context)
     : ObjectBackedNativeHandler(context) {
   RouteFunction(
       "GetFileSystem",
-       base::Bind(&FileBrowserPrivateCustomBindings::GetFileSystem,
+       base::Bind(&FileManagerPrivateCustomBindings::GetFileSystem,
                   base::Unretained(this)));
 }
 
-void FileBrowserPrivateCustomBindings::GetFileSystem(
+void FileManagerPrivateCustomBindings::GetFileSystem(
     const v8::FunctionCallbackInfo<v8::Value>& args) {
   DCHECK(args.Length() == 2);
   DCHECK(args[0]->IsString());
diff --git a/chrome/renderer/extensions/file_browser_private_custom_bindings.h b/chrome/renderer/extensions/file_manager_private_custom_bindings.h
index 0439745..d164df4 100644
--- a/chrome/renderer/extensions/file_browser_private_custom_bindings.h
+++ b/chrome/renderer/extensions/file_manager_private_custom_bindings.h
@@ -2,25 +2,25 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_RENDERER_EXTENSIONS_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_H_
-#define CHROME_RENDERER_EXTENSIONS_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_H_
+#ifndef CHROME_RENDERER_EXTENSIONS_FILE_MANAGER_PRIVATE_CUSTOM_BINDINGS_H_
+#define CHROME_RENDERER_EXTENSIONS_FILE_MANAGER_PRIVATE_CUSTOM_BINDINGS_H_
 
 #include "base/compiler_specific.h"
 #include "extensions/renderer/object_backed_native_handler.h"
 
 namespace extensions {
 
-// Custom bindings for the fileBrowserPrivate API.
-class FileBrowserPrivateCustomBindings : public ObjectBackedNativeHandler {
+// Custom bindings for the fileManagerPrivate API.
+class FileManagerPrivateCustomBindings : public ObjectBackedNativeHandler {
  public:
-  explicit FileBrowserPrivateCustomBindings(ScriptContext* context);
+  explicit FileManagerPrivateCustomBindings(ScriptContext* context);
 
   void GetFileSystem(const v8::FunctionCallbackInfo<v8::Value>& args);
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(FileBrowserPrivateCustomBindings);
+  DISALLOW_COPY_AND_ASSIGN(FileManagerPrivateCustomBindings);
 };
 
 }  // namespace extensions
 
-#endif  // CHROME_RENDERER_EXTENSIONS_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_H_
+#endif  // CHROME_RENDERER_EXTENSIONS_FILE_MANAGER_PRIVATE_CUSTOM_BINDINGS_H_
diff --git a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js b/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js
index e0301b0..9d374ae 100644
--- a/chrome/renderer/resources/extensions/file_browser_private_custom_bindings.js
+++ b/chrome/renderer/resources/extensions/file_manager_private_custom_bindings.js
@@ -2,22 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Custom binding for the fileBrowserPrivate API.
+// Custom binding for the fileManagerPrivate API.
 
 // Bindings
-var binding = require('binding').Binding.create('fileBrowserPrivate');
+var binding = require('binding').Binding.create('fileManagerPrivate');
 var eventBindings = require('event_bindings');
 
 // Natives
-var fileBrowserPrivateNatives = requireNative('file_browser_private');
+var fileManagerPrivateNatives = requireNative('file_manager_private');
 var fileBrowserHandlerNatives = requireNative('file_browser_handler');
 
 // Internals
-var fileBrowserPrivateInternal =
-    require('binding').Binding.create('fileBrowserPrivateInternal').generate();
+var fileManagerPrivateInternal =
+    require('binding').Binding.create('fileManagerPrivateInternal').generate();
 
 // Shorthands
-var GetFileSystem = fileBrowserPrivateNatives.GetFileSystem;
+var GetFileSystem = fileManagerPrivateNatives.GetFileSystem;
 var GetExternalFileEntry = fileBrowserHandlerNatives.GetExternalFileEntry;
 
 binding.registerCustomHook(function(bindingsAPI) {
@@ -73,7 +73,7 @@ binding.registerCustomHook(function(bindingsAPI) {
     var urls = entries.map(function(entry) {
       return fileBrowserHandlerNatives.GetEntryURL(entry);
     });
-    fileBrowserPrivateInternal.resolveIsolatedEntries(urls, function(
+    fileManagerPrivateInternal.resolveIsolatedEntries(urls, function(
         entryDescriptions) {
       callback(entryDescriptions.map(function(description) {
         return GetExternalFileEntry(description);
@@ -83,7 +83,7 @@ binding.registerCustomHook(function(bindingsAPI) {
 });
 
 eventBindings.registerArgumentMassager(
-    'fileBrowserPrivate.onDirectoryChanged', function(args, dispatch) {
+    'fileManagerPrivate.onDirectoryChanged', function(args, dispatch) {
   // Convert the entry arguments into a real Entry object.
   args[0].entry = GetExternalFileEntry(args[0].entry);
   dispatch(args);
diff --git a/chrome/renderer/resources/renderer_resources.grd b/chrome/renderer/resources/renderer_resources.grd
index 9ad5486..77684ae 100644
--- a/chrome/renderer/resources/renderer_resources.grd
+++ b/chrome/renderer/resources/renderer_resources.grd
@@ -60,7 +60,7 @@
         <include name="IDR_EXTENSION_OPTIONS_EVENTS_JS" file="extensions\extension_options_events.js" type="BINDATA"/>
         <include name="IDR_FEEDBACK_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\feedback_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_BROWSER_HANDLER_CUSTOM_BINDINGS_JS" file="extensions\file_browser_handler_custom_bindings.js" type="BINDATA" />
-        <include name="IDR_FILE_BROWSER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\file_browser_private_custom_bindings.js" type="BINDATA" />
+        <include name="IDR_FILE_MANAGER_PRIVATE_CUSTOM_BINDINGS_JS" file="extensions\file_manager_private_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_ENTRY_BINDING_UTIL_JS" file="extensions\file_entry_binding_util.js" type="BINDATA" />
         <include name="IDR_FILE_SYSTEM_CUSTOM_BINDINGS_JS" file="extensions\file_system_custom_bindings.js" type="BINDATA" />
         <include name="IDR_FILE_SYSTEM_PROVIDER_CUSTOM_BINDINGS_JS" file="extensions\file_system_provider_custom_bindings.js" type="BINDATA" />
diff --git a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/manifest.json b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/manifest.json
index fa402c4..f05e95c 100644
--- a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/manifest.json
@@ -15,7 +15,7 @@
     }
   },
   "permissions": [
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler",
     "unlimitedStorage"
   ]
diff --git a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js
index 3ae7f54..70e1c25 100644
--- a/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/app_file_handler_multi/test.js
@@ -9,7 +9,7 @@
  * @type {Promise}
  */
 var volumeListPromise = new Promise(function(fulfill, reject) {
-  chrome.fileBrowserPrivate.getVolumeMetadataList(fulfill);
+  chrome.fileManagerPrivate.getVolumeMetadataList(fulfill);
 });
 
 /**
@@ -22,7 +22,7 @@ function getFileSystem(volumeType) {
     for (var i = 0; i < list.length; i++) {
       if (list[i].volumeType == volumeType) {
         return new Promise(function(fulfill) {
-          chrome.fileBrowserPrivate.requestFileSystem(
+          chrome.fileManagerPrivate.requestFileSystem(
               list[i].volumeId, fulfill);
         });
       }
@@ -109,7 +109,7 @@ function testPromise(promise) {
 function launchWithEntries(entries) {
   var urls = entries.map(function(entry) { return entry.toURL(); });
   var tasksPromise = new Promise(function(fulfill) {
-    chrome.fileBrowserPrivate.getFileTasks(urls, fulfill);
+    chrome.fileManagerPrivate.getFileTasks(urls, fulfill);
   }).then(function(tasks) {
     chrome.test.assertEq(1, tasks.length);
     chrome.test.assertEq('kidcpjlbjdmcnmccjhjdckhbngnhnepk|app|textAction',
@@ -124,7 +124,7 @@ function launchWithEntries(entries) {
   });
   var taskExecutedPromise = tasksPromise.then(function(task) {
     return new Promise(function(fulfill, reject) {
-      chrome.fileBrowserPrivate.executeTask(
+      chrome.fileManagerPrivate.executeTask(
           task.taskId,
           urls,
           function(result) {
@@ -138,7 +138,7 @@ function launchWithEntries(entries) {
   var resolvedEntriesPromise = launchDataPromise.then(function(launchData) {
     var entries = launchData.items.map(function(item) { return item.entry; });
     return new Promise(function(fulfill) {
-      chrome.fileBrowserPrivate.resolveIsolatedEntries(entries, fulfill);
+      chrome.fileManagerPrivate.resolveIsolatedEntries(entries, fulfill);
     });
   });
   return Promise.all([
diff --git a/chrome/test/data/extensions/api_test/file_browser/drive_search_test/manifest.json b/chrome/test/data/extensions/api_test/file_browser/drive_search_test/manifest.json
index a48f22f..5a95add 100644
--- a/chrome/test/data/extensions/api_test/file_browser/drive_search_test/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/drive_search_test/manifest.json
@@ -1,9 +1,9 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate tests",
+  "name": "chrome.fileManagerPrivate tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate.* component extension methods",
+  "description": "Tests of chrome.fileManagerPrivate.* component extension methods",
   "app": {
     "background": {
       "scripts": ["test.js"]
@@ -11,6 +11,6 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
   ]
 }
diff --git a/chrome/test/data/extensions/api_test/file_browser/drive_search_test/test.js b/chrome/test/data/extensions/api_test/file_browser/drive_search_test/test.js
index 721599d..d73dbc1 100644
--- a/chrome/test/data/extensions/api_test/file_browser/drive_search_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/drive_search_test/test.js
@@ -6,9 +6,9 @@
  * Extension apitests for drive search methods.
  * There are three tests functions run:
  * - loadFileSystem() which requests the Drive file system.
- * - driveSearch() which tests chrome.fileBrowserPrivate.searchDrive function.
+ * - driveSearch() which tests chrome.fileManagerPrivate.searchDrive function.
  * - driveMetadataSearch() which tests
- *   chrome.fileBrowserPrivate.searchDriveMetadata function.
+ *   chrome.fileManagerPrivate.searchDriveMetadata function.
  *
  * For both search test functions, the test verifies that the file system
  * operations can be performed on the returned result entries. For file entries
@@ -72,7 +72,7 @@ function getEntryVerifier(type) {
 chrome.test.runTests([
   // Loads filesystem that contains drive mount point.
   function loadFileSystem() {
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
       'drive:drive-user',
       function (fileSystem) {
         chrome.test.assertFalse(!fileSystem, 'Failed to get file system.');
@@ -94,7 +94,7 @@ chrome.test.runTests([
       });
   },
 
-  // Tests chrome.fileBrowserPrivate.searchDrive method.
+  // Tests chrome.fileManagerPrivate.searchDrive method.
   function driveSearch() {
     var query = 'empty';
     var expectedEntries = [
@@ -127,16 +127,16 @@ chrome.test.runTests([
           return;
         }
 
-        chrome.fileBrowserPrivate.searchDrive(
+        chrome.fileManagerPrivate.searchDrive(
             {query: query, nextFeed: nextFeed}, runNextQuery);
       });
     }
 
-    chrome.fileBrowserPrivate.searchDrive(
+    chrome.fileManagerPrivate.searchDrive(
         {query: query, nextFeed: ''}, runNextQuery);
   },
 
-  // Tests chrome.fileBrowserPrivate.searchDriveMetadata method.
+  // Tests chrome.fileManagerPrivate.searchDriveMetadata method.
   function driveMetadataSearch() {
     // The results should be sorted by (lastAccessed, lastModified) pair. The
     // sort should be decending. The comments above each expected result
@@ -160,7 +160,7 @@ chrome.test.runTests([
       'maxResults': 4
     };
 
-    chrome.fileBrowserPrivate.searchDriveMetadata(
+    chrome.fileManagerPrivate.searchDriveMetadata(
         query,
         function(entries) {
           chrome.test.assertFalse(!entries);
diff --git a/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/manifest.json b/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/manifest.json
index a48f22f..5a95add 100644
--- a/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/manifest.json
@@ -1,9 +1,9 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate tests",
+  "name": "chrome.fileManagerPrivate tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate.* component extension methods",
+  "description": "Tests of chrome.fileManagerPrivate.* component extension methods",
   "app": {
     "background": {
       "scripts": ["test.js"]
@@ -11,6 +11,6 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
   ]
 }
diff --git a/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/test.js b/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/test.js
index 18f7d88..6c392ed 100644
--- a/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/file_watcher_test/test.js
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 /**
- * Test component extension that tests fileBrowserPrivate file watch api.
+ * Test component extension that tests fileManagerPrivate file watch api.
  * The extension adds file watch on set of entries and performs set of file
  * system operations that should trigger onDirectoryChanged events for the
  * watched entries. On file system operations is performed per a test function.
@@ -34,7 +34,7 @@ function TestEventListener() {
   this.expectedEvents_ = {};
 
   /**
-   * List of fileBrowserPrivate.onDirectoryChanged events received before file
+   * List of fileManagerPrivate.onDirectoryChanged events received before file
    * system operation was done.
    *
    * @type {Array.<Object>}
@@ -60,7 +60,7 @@ function TestEventListener() {
   this.receivedEntry_ = null;
 
   /**
-   * The listener to the fileBrowserPrivate.onDirectoryChanged.
+   * The listener to the fileManagerPrivate.onDirectoryChanged.
    *
    * @type {function(Object)}
    * @private
@@ -73,7 +73,7 @@ TestEventListener.prototype = {
    * Starts listening for the onDirectoryChanged events.
    */
   start: function() {
-    chrome.fileBrowserPrivate.onDirectoryChanged.addListener(
+    chrome.fileManagerPrivate.onDirectoryChanged.addListener(
         this.eventListener_);
   },
 
@@ -116,7 +116,7 @@ TestEventListener.prototype = {
       return;
     this.done_ = true;
 
-    chrome.fileBrowserPrivate.onDirectoryChanged.removeListener(
+    chrome.fileManagerPrivate.onDirectoryChanged.removeListener(
         this.eventListener_);
     chrome.test.fail(message);
   },
@@ -132,7 +132,7 @@ TestEventListener.prototype = {
       return;
     this.done_ = true;
 
-    chrome.fileBrowserPrivate.onDirectoryChanged.removeListener(
+    chrome.fileManagerPrivate.onDirectoryChanged.removeListener(
         this.eventListener_);
     chrome.test.succeed();
   },
@@ -143,7 +143,7 @@ TestEventListener.prototype = {
    * it adds the event to |eventQueue_|. The events from |eventQueue_| will be
    * verified once the file system operation is done.
    *
-   * @param {Object} event chrome.fileBrowserPrivate.onDirectoryChanged event.
+   * @param {Object} event chrome.fileManagerPrivate.onDirectoryChanged event.
    * @private
    */
   onDirectoryChanged_: function(event) {
@@ -161,7 +161,7 @@ TestEventListener.prototype = {
    * It verifies that the recived event matches the expected event parameters.
    * If the received event was the last expected event, onSuccess_ is called.
    *
-   * @param {Object} event chrome.fileBrowserPrivate.onDirectoryChanged event.
+   * @param {Object} event chrome.fileManagerPrivate.onDirectoryChanged event.
    * @private
    */
   verifyReceivedEvent_: function(event) {
@@ -229,7 +229,7 @@ function initTests(callback) {
     fileSystem: null
   };
 
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     var possibleVolumeTypes = ['testing', 'drive'];
 
     var sortedVolumeMetadataList = volumeMetadataList.filter(function(volume) {
@@ -245,7 +245,7 @@ function initTests(callback) {
       return;
     }
 
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
         sortedVolumeMetadataList[0].volumeId,
         function(fileSystem) {
           if (!fileSystem) {
@@ -311,7 +311,7 @@ initTests(function(testParams, errorMessage) {
 
   chrome.test.runTests([
     function addFileWatch() {
-      chrome.fileBrowserPrivate.addFileWatch(
+      chrome.fileManagerPrivate.addFileWatch(
           testParams.entries.file.toURL(),
           chrome.test.callbackPass(function(success) {
             chrome.test.assertTrue(success);
@@ -319,7 +319,7 @@ initTests(function(testParams, errorMessage) {
     },
 
     function addSubdirWatch() {
-      chrome.fileBrowserPrivate.addFileWatch(
+      chrome.fileManagerPrivate.addFileWatch(
           testParams.entries.subdir.toURL(),
           chrome.test.callbackPass(function(success) {
             chrome.test.assertTrue(success);
@@ -327,7 +327,7 @@ initTests(function(testParams, errorMessage) {
     },
 
     function addDirWatch() {
-      chrome.fileBrowserPrivate.addFileWatch(
+      chrome.fileManagerPrivate.addFileWatch(
           testParams.entries.dir.toURL(),
           chrome.test.callbackPass(function(success) {
             chrome.test.assertTrue(success);
@@ -485,7 +485,7 @@ initTests(function(testParams, errorMessage) {
     },
 
     function removeFileWatch() {
-      chrome.fileBrowserPrivate.removeFileWatch(
+      chrome.fileManagerPrivate.removeFileWatch(
           testParams.entries.file.toURL(),
           chrome.test.callbackPass(function(success) {
             chrome.test.assertTrue(success);
@@ -493,7 +493,7 @@ initTests(function(testParams, errorMessage) {
     },
 
     function removeDirWatch() {
-      chrome.fileBrowserPrivate.removeFileWatch(
+      chrome.fileManagerPrivate.removeFileWatch(
           testParams.entries.dir.toURL(),
           chrome.test.callbackPass(function(success) {
             chrome.test.assertTrue(success);
diff --git a/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/background.js b/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/background.js
index 05703e3..742e491 100644
--- a/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/background.js
+++ b/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/background.js
@@ -74,7 +74,7 @@ function sendXHR(url) {
  */
 function requestDriveFileSystem() {
   return new Promise(function(fulfill) {
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
         'drive:drive-user',
         function(fileSystem) {
           chrome.test.assertTrue(!!fileSystem);
@@ -107,7 +107,7 @@ function testResolveFileSystemURL() {
  */
 function testSendXHRToFileSystemURL() {
   // Thus we grant the permission to the extension in
-  // chrome.fileBrowserPrivate.requestFileSystem, we need to call the method
+  // chrome.fileManagerPrivate.requestFileSystem, we need to call the method
   // before.
   reportPromise(requestDriveFileSystem().then(function(fileSystem) {
     return Promise.all([
diff --git a/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/manifest.json b/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/manifest.json
index 41d5662..bb07bd2 100644
--- a/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/filesystem_file_origin_url/manifest.json
@@ -9,7 +9,7 @@
     }
   },
   "permissions": [
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler",
     "unlimitedStorage",
     "filesystem:*",
diff --git a/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/manifest.json b/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/manifest.json
index a48f22f..5a95add 100644
--- a/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/manifest.json
@@ -1,9 +1,9 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate tests",
+  "name": "chrome.fileManagerPrivate tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate.* component extension methods",
+  "description": "Tests of chrome.fileManagerPrivate.* component extension methods",
   "app": {
     "background": {
       "scripts": ["test.js"]
@@ -11,6 +11,6 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
   ]
 }
diff --git a/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/test.js b/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/test.js
index 2c75186..24b2fd1 100644
--- a/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/filesystem_operations_test/test.js
@@ -485,7 +485,7 @@ function collectTestsForVolumeId(volumeId, fileSystem) {
  *     to run will be null.
  */
 function initTests(callback) {
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     var possibleVolumeTypes = ['testing', 'drive'];
 
     var sortedVolumeMetadataList = volumeMetadataList.filter(function(volume) {
@@ -500,7 +500,7 @@ function initTests(callback) {
       return;
     }
 
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
         sortedVolumeMetadataList[0].volumeId,
         function(fileSystem) {
           if (!fileSystem) {
diff --git a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/manifest.json b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/manifest.json
index fc8e810..fa6bc24 100644
--- a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/manifest.json
@@ -1,9 +1,9 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate tests",
+  "name": "chrome.fileManagerPrivate tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate.* component extension methods",
+  "description": "Tests of chrome.fileManagerPrivate.* component extension methods",
   "app": {
     "background": {
       "scripts": ["test.js"]
@@ -11,7 +11,7 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
   ]
 }
 
diff --git a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js
index c229264..8d0d7da5 100644
--- a/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/handler_test_runner/test.js
@@ -70,7 +70,7 @@ function run() {
   }
 
   /**
-   * Callback to chrome.fileBrowserPrivate.executeTask. Verifies the function
+   * Callback to chrome.fileManagerPrivate.executeTask. Verifies the function
    * succeeded.
    *
    * @param {string} url The url of file for which the handler was executed.
@@ -82,7 +82,7 @@ function run() {
   }
 
   /**
-   * Callback to chrome.fileBrowserPrivate.getFileTasks.
+   * Callback to chrome.fileManagerPrivate.getFileTasks.
    * It checks that the returned task is not the default, sets it as the default
    * and calls getFileTasks again.
    *
@@ -103,14 +103,14 @@ function run() {
       onError('Task "' + tasks[0].taskId + '" is default for "' + fileUrl +
           '"');
     }
-    chrome.fileBrowserPrivate.setDefaultTask(
+    chrome.fileManagerPrivate.setDefaultTask(
         tasks[0].taskId, [fileUrl],
-        chrome.fileBrowserPrivate.getFileTasks.bind(null, [fileUrl],
+        chrome.fileManagerPrivate.getFileTasks.bind(null, [fileUrl],
             onGotTasks.bind(null, fileUrl)));
   }
 
   /**
-   * Callback to chrome.fileBrowserPrivate.getFileTasks.
+   * Callback to chrome.fileManagerPrivate.getFileTasks.
    * It remembers the returned task id and url. When tasks for all test cases
    * are found, they are executed.
    *
@@ -135,7 +135,7 @@ function run() {
 
     if (foundTasks.length == kTestPaths.length) {
       foundTasks.forEach(function(task) {
-        chrome.fileBrowserPrivate.executeTask(task.id, [task.url],
+        chrome.fileManagerPrivate.executeTask(task.id, [task.url],
             onExecuteTask.bind(null, task.url));
       });
     }
@@ -153,7 +153,7 @@ function run() {
 
     if (resolvedEntries.length == kTestPaths.length) {
       resolvedEntries.forEach(function(entry) {
-        chrome.fileBrowserPrivate.getFileTasks(
+        chrome.fileManagerPrivate.getFileTasks(
             [entry.toURL()],
             onGotNonDefaultTasks.bind(null, entry.toURL()));
       });
@@ -177,7 +177,7 @@ function run() {
     });
   }
 
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     // Try to acquire the first volume which is either TESTING or DRIVE type.
     var possibleVolumeTypes = ['testing', 'drive'];
     var sortedVolumeMetadataList = volumeMetadataList.filter(function(volume) {
@@ -190,7 +190,7 @@ function run() {
       onError('No volumes available, which could be used for testing.');
       return;
     }
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
         sortedVolumeMetadataList[0].volumeId,
         function(fileSystem) {
           if (!fileSystem) {
diff --git a/chrome/test/data/extensions/api_test/file_browser/mount_test/manifest.json b/chrome/test/data/extensions/api_test/file_browser/mount_test/manifest.json
index f698bfc..a9f6406 100644
--- a/chrome/test/data/extensions/api_test/file_browser/mount_test/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/mount_test/manifest.json
@@ -1,14 +1,14 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate Mount Tests",
+  "name": "chrome.fileManagerPrivate Mount Tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate component extension methods that communicate with MountLibrary",
+  "description": "Tests of chrome.fileManagerPrivate component extension methods that communicate with MountLibrary",
   "background": {
     "scripts": ["background.js"]
   },
   "permissions": [
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
    ]
 }
 
diff --git a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
index e636b97..9b31721 100644
--- a/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/mount_test/test.js
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// These have to be sync'd with file_browser_private_apitest.cc
+// These have to be sync'd with file_manager_private_apitest.cc
 var expectedVolume1 = {
   volumeId: 'removable:mount_path1',
   volumeLabel: 'mount_path1',
@@ -66,7 +66,7 @@ var expectedArchiveVolume = {
 };
 
 // List of expected mount points.
-// NOTE: this has to be synced with values in file_browser_private_apitest.cc
+// NOTE: this has to be synced with values in file_manager_private_apitest.cc
 //       and values sorted by volumeId.
 var expectedVolumeList = [
   expectedArchiveVolume,
@@ -113,7 +113,7 @@ function validateObject(received, expected, name) {
 
 chrome.test.runTests([
   function removeMount() {
-    chrome.fileBrowserPrivate.removeMount('archive:archive_mount_path');
+    chrome.fileManagerPrivate.removeMount('archive:archive_mount_path');
 
     // We actually check this one on C++ side. If MountLibrary.RemoveMount
     // doesn't get called, test will fail.
@@ -121,7 +121,7 @@ chrome.test.runTests([
   },
 
   function getVolumeMetadataList() {
-    chrome.fileBrowserPrivate.getVolumeMetadataList(
+    chrome.fileManagerPrivate.getVolumeMetadataList(
         chrome.test.callbackPass(function(result) {
           chrome.test.assertEq(expectedVolumeList.length, result.length,
               'getMountPoints returned wrong number of mount points.');
diff --git a/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/manifest.json b/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/manifest.json
index a48f22f..5a95add 100644
--- a/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/manifest.json
@@ -1,9 +1,9 @@
 {
   "key": "MIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDOuXEIuoK1kAkBe0SKiJn/N9oNn3oUxGa4dwj40MnJqPn+w0aR2vuyocm0R4Drp67aYwtLjOVPF4CICRq6ICP6eU07gGwQxGdZ7HJASXV8hm0tab5I70oJmRLfFJyVAMCeWlFaOGq05v2i6EbifZM0qO5xALKNGQt+yjXi5INM5wIBIw==",
-  "name": "chrome.fileBrowserPrivate tests",
+  "name": "chrome.fileManagerPrivate tests",
   "version": "0.1",
   "manifest_version": 2,
-  "description": "Tests of chrome.fileBrowserPrivate.* component extension methods",
+  "description": "Tests of chrome.fileManagerPrivate.* component extension methods",
   "app": {
     "background": {
       "scripts": ["test.js"]
@@ -11,6 +11,6 @@
   },
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate"
+    "fileManagerPrivate"
   ]
 }
diff --git a/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/test.js b/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/test.js
index 1dee708..358d437 100644
--- a/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/test.js
+++ b/chrome/test/data/extensions/api_test/file_browser/multi_profile_copy/test.js
@@ -19,7 +19,7 @@ function fileErrorCallback(callback, message) {
 }
 
 /**
- * Copies an entry using chrome.fileBrowserPrivate.startCopy().
+ * Copies an entry using chrome.fileManagerPrivate.startCopy().
  *
  * @param {Entry} fromRoot Root entry of the copy source file system.
  * @param {string} fromPath Relative path from fromRoot of the source entry.
@@ -40,17 +40,17 @@ function fileCopy(fromRoot, fromPath, toRoot, toPath, newName,
           return;
         }
         if (status.type == 'error') {
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(onProgress);
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(onProgress);
           errorCallback('Copy failed.');
           return;
         }
         if (status.type == 'success') {
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(onProgress);
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(onProgress);
           successCallback();
         }
       };
-      chrome.fileBrowserPrivate.onCopyProgress.addListener(onProgress);
-      chrome.fileBrowserPrivate.startCopy(
+      chrome.fileManagerPrivate.onCopyProgress.addListener(onProgress);
+      chrome.fileManagerPrivate.startCopy(
         from.toURL(), to.toURL(), newName, function(startCopyId) {
           if (chrome.runtime.lastError) {
             errorCallback('Error starting to copy.');
@@ -116,7 +116,7 @@ function collectTests(firstRoot, secondRoot) {
  *     to run will be null.
  */
 function initTests(callback) {
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     var driveVolumes = volumeMetadataList.filter(function(volume) {
       return volume.volumeType == 'drive';
     });
@@ -126,7 +126,7 @@ function initTests(callback) {
       return;
     }
 
-    chrome.fileBrowserPrivate.requestFileSystem(
+    chrome.fileManagerPrivate.requestFileSystem(
         driveVolumes[0].volumeId,
         function(primaryFileSystem) {
           if (!primaryFileSystem) {
diff --git a/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/test_helper_on_ui_page.js b/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/test_helper_on_ui_page.js
index 0e9f95e..5516995 100644
--- a/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/test_helper_on_ui_page.js
+++ b/chrome/test/data/extensions/api_test/file_manager_browsertest/video_player/test_helper_on_ui_page.js
@@ -5,11 +5,11 @@
 'use strict';
 
 /**
- * Overrides fileBrowserPrivate.getDownloadUrl
+ * Overrides fileManagerPrivate.getDownloadUrl
  * @param {string} url
  * @param {function(string)} callback
  */
-chrome.fileBrowserPrivate.getDownloadUrl = function(url, callback) {
+chrome.fileManagerPrivate.getDownloadUrl = function(url, callback) {
   var dummyUrl = 'http://example.com/test.mp4?access_token=ACCESSTOKEN;
   setTimeout(callback.bind(null, dummyUrl));
 };
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/big_file/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/big_file/manifest.json
index e10a8ac..b38361c 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/big_file/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/big_file/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onReadFileRequested(). Testing support for very large files.",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/copy_entry/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/copy_entry/manifest.json
index fdd79b8..8e2086d 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/copy_entry/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/copy_entry/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onCopyEntryRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/create_directory/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/create_directory/manifest.json
index b6e05fa..2228bfb 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/create_directory/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/create_directory/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onCreateDirectoryRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/create_file/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/create_file/manifest.json
index adf1eb8..5d06fc7 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/create_file/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/create_file/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onCreateFileRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/delete_entry/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/delete_entry/manifest.json
index 4f7f420..032d5d1 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/delete_entry/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/delete_entry/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onDeleteEntryRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/evil/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/evil/manifest.json
index c0e6034..273c982 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/evil/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/evil/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onReadFileRequested(). Testing evil behavior of providing extensions.",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json
index b81661a..a0f795e 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/extension/manifest.json
@@ -4,7 +4,7 @@
   "version": "0.1",
   "manifest_version": 2,
   "description": "Test for chrome.fileSystemProvider.mount() in an extension.",
-  "permissions": ["fileSystemProvider", "fileBrowserPrivate"],
+  "permissions": ["fileSystemProvider", "fileManagerPrivate"],
   "background": {
     "persistent": false,
     "scripts": [
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/get_all/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/get_all/manifest.json
index 8e4932e..f2d0ac3 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/get_all/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/get_all/manifest.json
@@ -4,7 +4,7 @@
   "version": "0.1",
   "manifest_version": 2,
   "description": "Test for chrome.fileSystemProvider.getAll().",
-  "permissions": ["fileSystemProvider", "fileBrowserPrivate"],
+  "permissions": ["fileSystemProvider", "fileManagerPrivate"],
   "app": {
     "background": {
       "scripts": [
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/get_metadata/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/get_metadata/manifest.json
index 315e340..fd65a4e 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/get_metadata/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/get_metadata/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onGetMetadataRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/manifest.json
index 8ed7344..0a3f4e5 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onGetMetadataRequested(). Mime types.",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "file_handlers": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
index 8f77cf7..a234084 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/mime_type/test.js
@@ -64,7 +64,7 @@ function runTests() {
           TESTING_WITH_MIME_FILE.name,
           {},
           function(entry) {
-          chrome.fileBrowserPrivate.getFileTasks(
+          chrome.fileManagerPrivate.getFileTasks(
               [entry.toURL()],
               function(tasks) {
                 chrome.test.assertEq(1, tasks.length);
@@ -84,7 +84,7 @@ function runTests() {
       var onSuccess = chrome.test.callbackPass();
       test_util.fileSystem.root.getFile(
           TESTING_WITH_MIME_FILE.name, {}, function(entry) {
-          chrome.fileBrowserPrivate.getFileTasks(
+          chrome.fileManagerPrivate.getFileTasks(
               [entry.toURL()],
               function(tasks) {
                 chrome.test.assertEq(1, tasks.length);
@@ -105,7 +105,7 @@ function runTests() {
                   onSuccess();
                 };
                 chrome.app.runtime.onLaunched.addListener(onLaunched);
-                chrome.fileBrowserPrivate.executeTask(
+                chrome.fileManagerPrivate.executeTask(
                     tasks[0].taskId, [entry.toURL()]);
               });
           }, function(error) {
@@ -121,7 +121,7 @@ function runTests() {
           TESTING_WITHOUT_MIME_FILE.name,
           {},
           function(entry) {
-            chrome.fileBrowserPrivate.getFileTasks(
+            chrome.fileManagerPrivate.getFileTasks(
                 [entry.toURL()],
                 function(tasks) {
                   chrome.test.assertEq(0, tasks.length);
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/mount/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/mount/manifest.json
index 5f2872a..e785edc 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/mount/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/mount/manifest.json
@@ -4,7 +4,7 @@
   "version": "0.1",
   "manifest_version": 2,
   "description": "Test for chrome.fileSystemProvider.mount().",
-  "permissions": ["fileSystemProvider", "fileBrowserPrivate"],
+  "permissions": ["fileSystemProvider", "fileManagerPrivate"],
   "app": {
     "background": {
       "scripts": [
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/mount/test.js b/chrome/test/data/extensions/api_test/file_system_provider/mount/test.js
index 0d19d4c..f70cd08 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/mount/test.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/mount/test.js
@@ -52,14 +52,14 @@ chrome.test.runTests([
 
   // End to end test. Mounts a volume using fileSystemProvider.mount(), then
   // checks if the mounted volume is added to VolumeManager, by querying
-  // fileBrowserPrivate.getVolumeMetadataList().
+  // fileManagerPrivate.getVolumeMetadataList().
   function successfulMount() {
     var onTestSuccess = chrome.test.callbackPass();
     var fileSystemId = 'caramel-candy';
     chrome.fileSystemProvider.mount(
         {fileSystemId: fileSystemId, displayName: 'caramel-candy.zip'},
         function() {
-          chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeList) {
+          chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeList) {
             var volumeInfo;
             volumeList.forEach(function(inVolumeInfo) {
               if (inVolumeInfo.extensionId == chrome.runtime.id &&
@@ -89,7 +89,7 @@ chrome.test.runTests([
           writable: true
         },
         function() {
-          chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeList) {
+          chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeList) {
             var volumeInfo;
             volumeList.forEach(function(inVolumeInfo) {
               if (inVolumeInfo.extensionId == chrome.runtime.id &&
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/move_entry/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/move_entry/manifest.json
index fdd79b8..8e2086d 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/move_entry/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/move_entry/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onCopyEntryRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json
index 8634da5..dff0262 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/read_directory/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onReadDirectoryRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/read_file/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/read_file/manifest.json
index 2c194ac..636eee6 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/read_file/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/read_file/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onReadFileRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/test_util/test_util.js b/chrome/test/data/extensions/api_test/file_system_provider/test_util/test_util.js
index b1601bf..21c6dd7 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/test_util/test_util.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/test_util/test_util.js
@@ -55,7 +55,7 @@ test_util.openedFiles = {};
  *     volume information object in case of success, or null if not found.
  */
 test_util.getVolumeInfo = function(fileSystemId, callback) {
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeList) {
     for (var i = 0; i < volumeList.length; i++) {
       if (volumeList[i].extensionId == chrome.runtime.id &&
           volumeList[i].fileSystemId == fileSystemId) {
@@ -87,7 +87,7 @@ test_util.mountFileSystem = function(callback) {
 
         test_util.getVolumeInfo(test_util.FILE_SYSTEM_ID, function(volumeInfo) {
           chrome.test.assertTrue(!!volumeInfo);
-          chrome.fileBrowserPrivate.requestFileSystem(
+          chrome.fileManagerPrivate.requestFileSystem(
               volumeInfo.volumeId,
               function(inFileSystem) {
                 chrome.test.assertTrue(!!inFileSystem);
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/manifest.json
index f1bb02d..ef083990 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onGetMetadataRequested() for thumbnails.",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/test.js b/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/test.js
index 0916a71..2981844 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/test.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/thumbnail/test.js
@@ -166,7 +166,7 @@ function runTests() {
           TESTING_WITH_VALID_THUMBNAIL_FILE.name,
           {create: false},
           function(fileEntry) {
-            chrome.fileBrowserPrivate.getEntryProperties(
+            chrome.fileManagerPrivate.getEntryProperties(
                 [fileEntry.toURL()],
                 function(fileProperties) {
                   chrome.test.assertEq(1, fileProperties.length);
@@ -195,7 +195,7 @@ function runTests() {
           TESTING_WITH_INVALID_THUMBNAIL_FILE.name,
           {create: false},
           function(fileEntry) {
-            chrome.fileBrowserPrivate.getEntryProperties(
+            chrome.fileManagerPrivate.getEntryProperties(
                 [fileEntry.toURL()],
                 function(fileProperties) {
                   chrome.test.assertEq(1, fileProperties.length);
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/truncate/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/truncate/manifest.json
index d902aa9..2e50919 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/truncate/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/truncate/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onTruncateRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/unmount/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/unmount/manifest.json
index b36152e..7d4f3c4 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/unmount/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/unmount/manifest.json
@@ -4,7 +4,7 @@
   "version": "0.1",
   "manifest_version": 2,
   "description": "Test for chrome.fileSystemProvider.unmount().",
-  "permissions": ["fileSystemProvider", "fileBrowserPrivate"],
+  "permissions": ["fileSystemProvider", "fileManagerPrivate"],
   "app": {
     "background": {
       "scripts": [
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/unmount/test.js b/chrome/test/data/extensions/api_test/file_system_provider/unmount/test.js
index 1b7ea0d..2daeba6 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/unmount/test.js
+++ b/chrome/test/data/extensions/api_test/file_system_provider/unmount/test.js
@@ -58,12 +58,12 @@ function runTests() {
             chrome.runtime.id, event.volumeMetadata.extensionId);
         chrome.test.assertEq(
             FIRST_FILE_SYSTEM_ID, event.volumeMetadata.fileSystemId);
-        chrome.fileBrowserPrivate.onMountCompleted.removeListener(
+        chrome.fileManagerPrivate.onMountCompleted.removeListener(
             onMountCompleted);
         onTestSuccess();
       };
 
-      chrome.fileBrowserPrivate.onMountCompleted.addListener(
+      chrome.fileManagerPrivate.onMountCompleted.addListener(
           onMountCompleted);
       chrome.fileSystemProvider.unmount(
           {fileSystemId: FIRST_FILE_SYSTEM_ID},
@@ -90,7 +90,7 @@ function runTests() {
           });
     },
 
-    // Tests if fileBrowserPrivate.removeMount() for provided file systems emits
+    // Tests if fileManagerPrivate.removeMount() for provided file systems emits
     // the onMountRequested() event with correct arguments.
     function requestUnmountSuccess() {
       var onTestSuccess = chrome.test.callbackPass();
@@ -110,7 +110,7 @@ function runTests() {
 
       test_util.getVolumeInfo(SECOND_FILE_SYSTEM_ID, function(volumeInfo) {
         chrome.test.assertTrue(!!volumeInfo);
-        chrome.fileBrowserPrivate.removeMount(volumeInfo.volumeId);
+        chrome.fileManagerPrivate.removeMount(volumeInfo.volumeId);
       });
     },
 
@@ -141,19 +141,19 @@ function runTests() {
         chrome.test.assertTrue(unmountRequested);
 
         // Remove the handlers and mark the test as succeeded.
-        chrome.fileBrowserPrivate.removeMount(SECOND_FILE_SYSTEM_ID);
-        chrome.fileBrowserPrivate.onMountCompleted.removeListener(
+        chrome.fileManagerPrivate.removeMount(SECOND_FILE_SYSTEM_ID);
+        chrome.fileManagerPrivate.onMountCompleted.removeListener(
             onMountCompleted);
         onTestSuccess();
       };
 
       chrome.fileSystemProvider.onUnmountRequested.addListener(
           onUnmountRequested);
-      chrome.fileBrowserPrivate.onMountCompleted.addListener(onMountCompleted);
+      chrome.fileManagerPrivate.onMountCompleted.addListener(onMountCompleted);
 
       test_util.getVolumeInfo(SECOND_FILE_SYSTEM_ID, function(volumeInfo) {
         chrome.test.assertTrue(!!volumeInfo);
-        chrome.fileBrowserPrivate.removeMount(volumeInfo.volumeId);
+        chrome.fileManagerPrivate.removeMount(volumeInfo.volumeId);
       });
     }
   ]);
diff --git a/chrome/test/data/extensions/api_test/file_system_provider/write_file/manifest.json b/chrome/test/data/extensions/api_test/file_system_provider/write_file/manifest.json
index ae49945..8eb09f4 100644
--- a/chrome/test/data/extensions/api_test/file_system_provider/write_file/manifest.json
+++ b/chrome/test/data/extensions/api_test/file_system_provider/write_file/manifest.json
@@ -7,7 +7,7 @@
       "Test for chrome.fileSystemProvider.onWriteFileRequested().",
   "permissions": [
     "fileSystemProvider",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileBrowserHandler"
   ],
   "app": {
diff --git a/chrome/test/data/file_manager/unit_tests/device_handler_unittest.js b/chrome/test/data/file_manager/unit_tests/device_handler_unittest.js
index 758669d..c544871 100644
--- a/chrome/test/data/file_manager/unit_tests/device_handler_unittest.js
+++ b/chrome/test/data/file_manager/unit_tests/device_handler_unittest.js
@@ -44,7 +44,7 @@ function setUp() {
 
   // Make dummy APIs.
   chrome = {
-    fileBrowserPrivate: {
+    fileManagerPrivate: {
       onDeviceChanged: {
         addListener: function(listener) {
           this.dispatch = listener;
@@ -82,7 +82,7 @@ function setUp() {
 }
 
 function testGoodDevice() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'success',
     volumeMetadata: {
@@ -100,7 +100,7 @@ function testGoodDevice() {
 }
 
 function testGoodDeviceNotNavigated() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'success',
     volumeMetadata: {
@@ -115,7 +115,7 @@ function testGoodDeviceNotNavigated() {
 }
 
 function testGoodDeviceWithBadParent() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -131,7 +131,7 @@ function testGoodDeviceWithBadParent() {
       'DEVICE_UNKNOWN: label',
       chrome.notifications.items['deviceFail:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'success',
     volumeMetadata: {
@@ -147,7 +147,7 @@ function testGoodDeviceWithBadParent() {
       'DEVICE_NAVIGATION',
       chrome.notifications.items['deviceNavigation:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'success',
     volumeMetadata: {
@@ -166,7 +166,7 @@ function testGoodDeviceWithBadParent() {
 }
 
 function testUnsupportedDevice() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_unsupported_filesystem',
     volumeMetadata: {
@@ -184,7 +184,7 @@ function testUnsupportedDevice() {
 }
 
 function testUnsupportedWithUnknownParent() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -199,7 +199,7 @@ function testUnsupportedWithUnknownParent() {
       'DEVICE_UNKNOWN: label',
       chrome.notifications.items['deviceFail:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_unsupported_filesystem',
     volumeMetadata: {
@@ -217,7 +217,7 @@ function testUnsupportedWithUnknownParent() {
 }
 
 function testMountPartialSuccess() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'success',
     volumeMetadata: {
@@ -233,7 +233,7 @@ function testMountPartialSuccess() {
       'DEVICE_NAVIGATION',
       chrome.notifications.items['deviceNavigation:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_unsupported_filesystem',
     volumeMetadata: {
@@ -251,7 +251,7 @@ function testMountPartialSuccess() {
 }
 
 function testUnknown() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_unknown',
     volumeMetadata: {
@@ -269,7 +269,7 @@ function testUnknown() {
 }
 
 function testNonASCIILabel() {
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -289,7 +289,7 @@ function testNonASCIILabel() {
 
 function testMulitpleFail() {
   // The first parent error.
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -306,7 +306,7 @@ function testMulitpleFail() {
       chrome.notifications.items['deviceFail:/device/path'].message);
 
   // The first child error that replaces the parent error.
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -323,7 +323,7 @@ function testMulitpleFail() {
       chrome.notifications.items['deviceFail:/device/path'].message);
 
   // The second child error that turns to a multi-partition error.
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -341,7 +341,7 @@ function testMulitpleFail() {
 
   // The third child error that should be ignored because the error message does
   // not changed.
-  chrome.fileBrowserPrivate.onMountCompleted.dispatch({
+  chrome.fileManagerPrivate.onMountCompleted.dispatch({
     eventType: 'mount',
     status: 'error_internal',
     volumeMetadata: {
@@ -359,7 +359,7 @@ function testMulitpleFail() {
 }
 
 function testScanCanceled() {
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'scan_started',
     devicePath: '/device/path'
   });
@@ -367,14 +367,14 @@ function testScanCanceled() {
   assertEquals('Scanning...',
                chrome.notifications.items['device:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'scan_cancelled',
     devicePath: '/device/path'
   });
   assertEquals(0, Object.keys(chrome.notifications.items).length);
 
   // Nothing happened.
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'removed',
     devicePath: '/device/path'
   });
@@ -382,7 +382,7 @@ function testScanCanceled() {
 }
 
 function testDisabledDevice() {
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'disabled',
     devicePath: '/device/path'
   });
@@ -390,7 +390,7 @@ function testDisabledDevice() {
   assertEquals('EXTERNAL_STORAGE_DISABLED',
                chrome.notifications.items['deviceFail:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'removed',
     devicePath: '/device/path'
   });
@@ -398,7 +398,7 @@ function testDisabledDevice() {
 }
 
 function testFormatSucceeded() {
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'format_start',
     devicePath: '/device/path'
   });
@@ -406,7 +406,7 @@ function testFormatSucceeded() {
   assertEquals('FORMATTING_OF_DEVICE_PENDING',
                chrome.notifications.items['formatStart:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'format_success',
     devicePath: '/device/path'
   });
@@ -417,7 +417,7 @@ function testFormatSucceeded() {
 }
 
 function testFormatFailed() {
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'format_start',
     devicePath: '/device/path'
   });
@@ -425,7 +425,7 @@ function testFormatFailed() {
   assertEquals('FORMATTING_OF_DEVICE_PENDING',
                chrome.notifications.items['formatStart:/device/path'].message);
 
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'format_fail',
     devicePath: '/device/path'
   });
@@ -435,7 +435,7 @@ function testFormatFailed() {
 }
 
 function testDeviceHardUnplugged() {
-  chrome.fileBrowserPrivate.onDeviceChanged.dispatch({
+  chrome.fileManagerPrivate.onDeviceChanged.dispatch({
     type: 'hard_unplugged',
     devicePath: '/device/path'
   });
diff --git a/chrome/test/data/file_manager/unit_tests/file_operation_manager_unittest.js b/chrome/test/data/file_manager/unit_tests/file_operation_manager_unittest.js
index d447c1b..2677c85b 100644
--- a/chrome/test/data/file_manager/unit_tests/file_operation_manager_unittest.js
+++ b/chrome/test/data/file_manager/unit_tests/file_operation_manager_unittest.js
@@ -28,17 +28,17 @@ chrome.power = {
 };
 
 /**
- * Mock of chrome.fileBrowserPrivate.
+ * Mock of chrome.fileManagerPrivate.
  * @type {Object}
  * @const
  */
-chrome.fileBrowserPrivate = {
+chrome.fileManagerPrivate = {
   onCopyProgress: {
     addListener: function(callback) {
-      chrome.fileBrowserPrivate.onCopyProgress.listener_ = callback;
+      chrome.fileManagerPrivate.onCopyProgress.listener_ = callback;
     },
     removeListener: function() {
-      chrome.fileBrowserPrivate.onCopyProgress.listener_ = null;
+      chrome.fileManagerPrivate.onCopyProgress.listener_ = null;
     },
     listener_: null
   }
@@ -243,13 +243,13 @@ function testCopy(callback) {
   window.webkitResolveLocalFileSystemURL =
       resolveTestFileSystemURL.bind(null, fileSystem);
 
-  chrome.fileBrowserPrivate.startCopy =
+  chrome.fileManagerPrivate.startCopy =
       function(source, destination, newName, callback) {
         var makeStatus = function(type) {
           return {type: type, sourceUrl: source, destinationUrl: destination};
         };
         callback(1);
-        var listener = chrome.fileBrowserPrivate.onCopyProgress.listener_;
+        var listener = chrome.fileManagerPrivate.onCopyProgress.listener_;
         listener(1, makeStatus('begin_copy_entry'));
         listener(1, makeStatus('progress'));
         var newPath = joinPath('/', newName);
@@ -396,7 +396,7 @@ function testZip(callback) {
   });
   window.webkitResolveLocalFileSystemURL =
       resolveTestFileSystemURL.bind(null, fileSystem);
-  chrome.fileBrowserPrivate.zipSelection =
+  chrome.fileManagerPrivate.zipSelection =
       function(parentURL, sources, newName, success, error) {
         var newPath = joinPath('/', newName);
         var newEntry = new MockFileEntry(fileSystem, newPath, {size: 10});
diff --git a/chrome/test/ext_auto/auto_provider/manifest.json b/chrome/test/ext_auto/auto_provider/manifest.json
index 6ecc2e2..ede8acb 100644
--- a/chrome/test/ext_auto/auto_provider/manifest.json
+++ b/chrome/test/ext_auto/auto_provider/manifest.json
@@ -32,7 +32,7 @@
      "downloads",
      "experimental",
      "fileBrowserHandler",
-     "fileBrowserPrivate",
+     "fileManagerPrivate",
      "fileSystem",
      "fileSystem.write",
      "fontSettings",
diff --git a/extensions/browser/extension_function_histogram_value.h b/extensions/browser/extension_function_histogram_value.h
index 3442077..edb2ffa 100644
--- a/extensions/browser/extension_function_histogram_value.h
+++ b/extensions/browser/extension_function_histogram_value.h
@@ -62,7 +62,7 @@ enum HistogramValue {
   WEBNAVIGATION_GETALLFRAMES,
   BROWSINGDATA_REMOVEWEBSQL,
   ALARMS_CREATE,
-  FILEBROWSERPRIVATE_REMOVEFILEWATCH,
+  FILEMANAGERPRIVATE_REMOVEFILEWATCH,
   COOKIES_GET,
   FONTSETTINGS_GETMINIMUMFONTSIZE,
   CHROMEOSINFOPRIVATE_GET,
@@ -75,18 +75,18 @@ enum HistogramValue {
   DOWNLOADS_CANCEL,
   BOOKMARKS_CREATE,
   BOOKMARKS_UPDATE,
-  FILEBROWSERPRIVATE_GETDRIVEFILES,
+  FILEMANAGERPRIVATE_GETDRIVEFILES,
   TERMINALPRIVATE_ONTERMINALRESIZE,
-  DELETED_FILEBROWSERPRIVATE_REQUESTDIRECTORYREFRESH,
+  DELETED_FILEMANAGERPRIVATE_REQUESTDIRECTORYREFRESH,
   BLUETOOTH_GETADAPTERSTATE,
-  FILEBROWSERPRIVATE_CANCELFILETRANSFERS,
-  FILEBROWSERPRIVATE_PINDRIVEFILE,
+  FILEMANAGERPRIVATE_CANCELFILETRANSFERS,
+  FILEMANAGERPRIVATE_PINDRIVEFILE,
   SOCKET_WRITE,
   OMNIBOX_SETDEFAULTSUGGESTION,
   TTS_SPEAK,
   WALLPAPERPRIVATE_RESTOREMINIMIZEDWINDOWS,
   BROWSINGDATA_REMOVEHISTORY,
-  DELETED_FILEBROWSERPRIVATE_ISFULLSCREEN,
+  DELETED_FILEMANAGERPRIVATE_ISFULLSCREEN,
   AUTOTESTPRIVATE_LOGOUT,
   EXPERIMENTAL_HISTORY_GETMOSTVISITED,
   DELETED_BLUETOOTH_DISCONNECT,
@@ -111,9 +111,9 @@ enum HistogramValue {
   APP_CURRENTWINDOWINTERNAL_SETBOUNDS,
   CLOUDPRINTPRIVATE_SETUPCONNECTOR,
   SERIAL_SETCONTROLSIGNALS,
-  DELETED_FILEBROWSERPRIVATE_SETLASTMODIFIED,
+  DELETED_FILEMANAGERPRIVATE_SETLASTMODIFIED,
   IDLE_SETDETECTIONINTERVAL,
-  FILEBROWSERPRIVATE_GETFILETASKS,
+  FILEMANAGERPRIVATE_GETFILETASKS,
   WEBSTOREPRIVATE_GETSTORELOGIN,
   SYSTEMPRIVATE_GETINCOGNITOMODEAVAILABILITY,
   IDLTEST_SENDARRAYBUFFERVIEW,
@@ -132,13 +132,13 @@ enum HistogramValue {
   USB_CLOSEDEVICE,
   TTS_STOP,
   DELETED_SERIAL_GETPORTS,
-  DELETED_FILEBROWSERPRIVATE_CLEARDRIVECACHE,
+  DELETED_FILEMANAGERPRIVATE_CLEARDRIVECACHE,
   SERIAL_GETCONTROLSIGNALS,
   DEVELOPERPRIVATE_ENABLE,
-  FILEBROWSERPRIVATE_GETENTRYPROPERTIES,
+  FILEMANAGERPRIVATE_GETENTRYPROPERTIES,
   USB_FINDDEVICES,
   BOOKMARKMANAGERPRIVATE_DROP,
-  DELETED_FILEBROWSERPRIVATE_GETFILETRANSFERS,
+  DELETED_FILEMANAGERPRIVATE_GETFILETRANSFERS,
   INPUT_IME_SETMENUITEMS,
   BOOKMARKS_EXPORT,
   HISTORY_SEARCH,
@@ -166,7 +166,7 @@ enum HistogramValue {
   TERMINALPRIVATE_OPENTERMINALPROCESS,
   DELETED_SERIAL_CLOSE,
   CONTEXTMENUS_REMOVE,
-  FILEBROWSERPRIVATE_REQUESTFILESYSTEM,
+  FILEMANAGERPRIVATE_REQUESTFILESYSTEM,
   ECHOPRIVATE_GETREGISTRATIONCODE,
   TABS_GETCURRENT,
   FONTSETTINGS_CLEARDEFAULTFIXEDFONTSIZE,
@@ -199,9 +199,9 @@ enum HistogramValue {
   DELETED_BLUETOOTH_GETLOCALOUTOFBANDPAIRINGDATA,
   SYSTEMPRIVATE_GETUPDATESTATUS,
   FONTSETTINGS_CLEARMINIMUMFONTSIZE,
-  DELETED_FILEBROWSERPRIVATE_GETFILELOCATIONS,
+  DELETED_FILEMANAGERPRIVATE_GETFILELOCATIONS,
   EXPERIMENTAL_DISCOVERY_SUGGEST,
-  FILEBROWSERPRIVATE_SETDEFAULTTASK,
+  FILEMANAGERPRIVATE_SETDEFAULTTASK,
   BROWSERACTION_GETBADGETEXT,
   APP_CURRENTWINDOWINTERNAL_HIDE,
   SOCKET_CONNECT,
@@ -229,7 +229,7 @@ enum HistogramValue {
   TABS_REMOVE,
   MANAGEMENT_GETPERMISSIONWARNINGSBYID,
   WINDOWS_GET,
-  FILEBROWSERPRIVATE_EXECUTETASK,
+  FILEMANAGERPRIVATE_EXECUTETASK,
   TTS_GETVOICES,
   MANAGEMENT_GETALL,
   MANAGEMENT_GETPERMISSIONWARNINGSBYMANIFEST,
@@ -237,7 +237,7 @@ enum HistogramValue {
   AUTOTESTPRIVATE_SHUTDOWN,
   FONTSETTINGS_CLEARDEFAULTFONTSIZE,
   BOOKMARKS_GETTREE,
-  FILEBROWSERPRIVATE_SELECTFILES,
+  FILEMANAGERPRIVATE_SELECTFILES,
   RUNTIME_GETBACKGROUNDPAGE,
   DELETED_EXPERIMENTAL_RECORD_REPLAYURLS,
   WEBSTOREPRIVATE_COMPLETEINSTALL,
@@ -248,7 +248,7 @@ enum HistogramValue {
   BROWSINGDATA_REMOVE,
   DELETED_SERIAL_OPEN,
   FILESYSTEM_GETDISPLAYPATH,
-  FILEBROWSERPRIVATE_FORMATVOLUME,
+  FILEMANAGERPRIVATE_FORMATVOLUME,
   BOOKMARKS_GET,
   DELETED_MANAGEDMODEPRIVATE_GET,
   ALARMS_CLEAR,
@@ -262,7 +262,7 @@ enum HistogramValue {
   CONTENTSETTINGS_GETRESOURCEIDENTIFIERS,
   SOCKET_CREATE,
   DEVELOPERPRIVATE_RELOAD,
-  FILEBROWSERPRIVATE_GETVOLUMEMETADATALIST,
+  FILEMANAGERPRIVATE_GETVOLUMEMETADATALIST,
   APP_RUNTIME_POSTINTENTRESPONSE,
   DELETED_MANAGEDMODEPRIVATE_SETPOLICY,
   WEBSTOREPRIVATE_BEGININSTALLWITHMANIFEST3,
@@ -270,7 +270,7 @@ enum HistogramValue {
   USB_CONTROLTRANSFER,
   DELETED_EXPERIMENTAL_SPEECHINPUT_STOP,
   USB_BULKTRANSFER,
-  DELETED_FILEBROWSERPRIVATE_GETVOLUMEMETADATA,
+  DELETED_FILEMANAGERPRIVATE_GETVOLUMEMETADATA,
   PAGECAPTURE_SAVEASMHTML,
   EXTENSION_ISALLOWEDINCOGNITOACCESS,
   BROWSINGDATA_REMOVEAPPCACHE,
@@ -313,7 +313,7 @@ enum HistogramValue {
   TERMINALPRIVATE_SENDINPUT,
   TABS_HIGHLIGHT,
   BLUETOOTH_STARTDISCOVERY,
-  FILEBROWSERPRIVATE_SELECTFILE,
+  FILEMANAGERPRIVATE_SELECTFILE,
   WINDOWS_GETCURRENT,
   DEBUGGER_ATTACH,
   WALLPAPERPRIVATE_SAVETHUMBNAIL,
@@ -332,7 +332,7 @@ enum HistogramValue {
   BROWSERACTION_GETBADGEBACKGROUNDCOLOR,
   DELETED_PAGEACTIONS_DISABLEFORTAB,
   DEVELOPERPRIVATE_ALLOWFILEACCESS,
-  FILEBROWSERPRIVATE_REMOVEMOUNT,
+  FILEMANAGERPRIVATE_REMOVEMOUNT,
   DELETED_BLUETOOTH_CONNECT,
   TABCAPTURE_CAPTURE,
   NOTIFICATIONS_CREATE,
@@ -347,7 +347,7 @@ enum HistogramValue {
   BROWSINGDATA_REMOVELOCALSTORAGE,
   FILEBROWSERHANDLERINTERNAL_SELECTFILE,
   INPUT_IME_UPDATEMENUITEMS,
-  FILEBROWSERPRIVATE_GETSTRINGS,
+  FILEMANAGERPRIVATE_GETSTRINGS,
   CONTENTSETTINGS_GET,
   FONTSETTINGS_SETDEFAULTFIXEDFONTSIZE,
   EXPERIMENTAL_APP_NOTIFY,
@@ -367,16 +367,16 @@ enum HistogramValue {
   TYPES_CHROMESETTING_SET,
   BROWSERACTION_SETICON,
   EXPERIMENTAL_ACCESSIBILITY_SETACCESSIBILITYENABLED,
-  DELETED_FILEBROWSERPRIVATE_VIEWFILES,
+  DELETED_FILEMANAGERPRIVATE_VIEWFILES,
   DELETED_BLUETOOTH_GETSERVICES,
   TABS_UPDATE,
   BROWSINGDATA_REMOVEFORMDATA,
-  DELETED_FILEBROWSERPRIVATE_RELOADDRIVE,
+  DELETED_FILEMANAGERPRIVATE_RELOADDRIVE,
   ALARMS_GET,
   BROWSINGDATA_REMOVEINDEXEDDB,
-  FILEBROWSERPRIVATE_ADDFILEWATCH,
+  FILEMANAGERPRIVATE_ADDFILEWATCH,
   CONTENTSETTINGS_CLEAR,
-  FILEBROWSERPRIVATE_GETPREFERENCES,
+  FILEMANAGERPRIVATE_GETPREFERENCES,
   BOOKMARKMANAGERPRIVATE_PASTE,
   FILESYSTEM_ISWRITABLEENTRY,
   USB_SETINTERFACEALTERNATESETTING,
@@ -386,12 +386,12 @@ enum HistogramValue {
   BLUETOOTH_GETDEVICES,
   ALARMS_CLEARALL,
   FONTSETTINGS_GETDEFAULTFIXEDFONTSIZE,
-  FILEBROWSERPRIVATE_ZIPSELECTION,
+  FILEMANAGERPRIVATE_ZIPSELECTION,
   SYSTEMINDICATOR_DISABLE,
   DELETED_SCRIPTBADGE_SETPOPUP,
   EXTENSION_ISALLOWEDFILESCHEMEACCESS,
   EXPERIMENTAL_IDENTITY_LAUNCHWEBAUTHFLOW,
-  FILEBROWSERPRIVATE_GETDRIVECONNECTIONSTATE,
+  FILEMANAGERPRIVATE_GETDRIVECONNECTIONSTATE,
   TABS_DETECTLANGUAGE,
   METRICSPRIVATE_RECORDVALUE,
   BOOKMARKMANAGERPRIVATE_SORTCHILDREN,
@@ -399,7 +399,7 @@ enum HistogramValue {
   APP_CURRENTWINDOWINTERNAL_MAXIMIZE,
   EXPERIMENTAL_DISCOVERY_CLEARALLSUGGESTIONS,
   DELETED_MANAGEDMODEPRIVATE_ENTER,
-  DELETED_FILEBROWSERPRIVATE_TRANSFERFILE,
+  DELETED_FILEMANAGERPRIVATE_TRANSFERFILE,
   BROWSERACTION_SETPOPUP,
   TABS_GETSELECTED,
   FONTSETTINGS_GETFONT,
@@ -412,9 +412,9 @@ enum HistogramValue {
   DELETED_EXPERIMENTAL_RECORD_CAPTUREURLS,
   TTS_ISSPEAKING,
   BOOKMARKS_REMOVETREE,
-  FILEBROWSERPRIVATE_SEARCHDRIVE,
+  FILEMANAGERPRIVATE_SEARCHDRIVE,
   DELETED_EXPERIMENTAL_SYSTEMINFO_CPU_GET,
-  FILEBROWSERPRIVATE_SETPREFERENCES,
+  FILEMANAGERPRIVATE_SETPREFERENCES,
   FONTSETTINGS_SETFONT,
   SOCKET_GETNETWORKLIST,
   BOOKMARKS_MOVE,
@@ -422,7 +422,7 @@ enum HistogramValue {
   STORAGE_REMOVE,
   AUTOTESTPRIVATE_LOGINSTATUS,
   TABS_CREATE,
-  FILEBROWSERPRIVATE_CANCELDIALOG,
+  FILEMANAGERPRIVATE_CANCELDIALOG,
   BROWSINGDATA_REMOVECOOKIES,
   FILESYSTEM_CHOOSEENTRY,
   MEDIAPLAYERPRIVATE_PLAY,
@@ -438,19 +438,19 @@ enum HistogramValue {
   RUNTIME_RELOAD,
   EXPERIMENTAL_POWER_REQUESTKEEPAWAKE,
   SYSTEMINDICATOR_SETICON,
-  FILEBROWSERPRIVATE_ADDMOUNT,
+  FILEMANAGERPRIVATE_ADDMOUNT,
   APP_CURRENTWINDOWINTERNAL_FOCUS,
   EVENTS_REMOVERULES,
   DOWNLOADS_DOWNLOAD,
   WINDOWS_GETALL,
-  DELETED_FILEBROWSERPRIVATE_TOGGLEFULLSCREEN,
+  DELETED_FILEMANAGERPRIVATE_TOGGLEFULLSCREEN,
   APP_CURRENTWINDOWINTERNAL_RESTORE,
   DELETED_WEBSOCKETPROXYPRIVATE_GETPASSPORTFORTCP,
   PAGEACTION_HIDE,
   DELETED_EXPERIMENTAL_SYSTEMINFO_STORAGE_GET,
   DOWNLOADS_ACCEPTDANGER,
   DELETED_WEBSOCKETPROXYPRIVATE_GETURLFORTCP,
-  FILEBROWSERPRIVATE_GETSIZESTATS,
+  FILEMANAGERPRIVATE_GETSIZESTATS,
   DOWNLOADS_RESUME,
   COOKIES_GETALLCOOKIESTORES,
   MEDIAGALLERIESPRIVATE_ADDGALLERYWATCH,
@@ -462,7 +462,7 @@ enum HistogramValue {
   DELETED_SESSIONRESTORE_RESTORE,
   MANAGEMENT_UNINSTALLSELF,
   ECHOPRIVATE_GETOOBETIMESTAMP,
-  FILEBROWSERPRIVATE_VALIDATEPATHNAMELENGTH,
+  FILEMANAGERPRIVATE_VALIDATEPATHNAMELENGTH,
   BROWSINGDATA_SETTINGS,
   WEBSTOREPRIVATE_GETISLAUNCHERENABLED,
   NETWORKINGPRIVATE_GETPROPERTIES,
@@ -471,10 +471,10 @@ enum HistogramValue {
   NETWORKINGPRIVATE_STARTDISCONNECT,
   MEDIAGALLERIESPRIVATE_GETALLGALLERYWATCH,
   MEDIAGALLERIESPRIVATE_REMOVEALLGALLERYWATCH,
-  FILEBROWSERPRIVATE_SEARCHDRIVEMETADATA,
+  FILEMANAGERPRIVATE_SEARCHDRIVEMETADATA,
   DELETED_ECHOPRIVATE_CHECKALLOWREDEEMOFFERS,
   DELETED_MEDIAGALLERIESPRIVATE_EJECTDEVICE,
-  FILEBROWSERPRIVATE_LOGOUTUSERFORREAUTHENTICATION,
+  FILEMANAGERPRIVATE_LOGOUTUSERFORREAUTHENTICATION,
   DEVELOPERPRIVATE_CHOOSEPATH,
   DEVELOPERPRIVATE_PACKDIRECTORY,
   NETWORKINGPRIVATE_VERIFYDESTINATION,
@@ -483,7 +483,7 @@ enum HistogramValue {
   DEVELOPERPRIVATE_RESTART,
   DEVELOPERPRIVATE_ALLOWINCOGNITO,
   INPUT_IME_DELETESURROUNDINGTEXT,
-  DELETED_FILEBROWSERPRIVATE_OPENNEWWINDOW,
+  DELETED_FILEMANAGERPRIVATE_OPENNEWWINDOW,
   CLOUDPRINTPRIVATE_GETCLIENTID,
   ECHOPRIVATE_GETUSERCONSENT,
   SYNCFILESYSTEM_SETCONFLICTRESOLUTIONPOLICY,
@@ -554,10 +554,10 @@ enum HistogramValue {
   VIRTUALKEYBOARDPRIVATE_INSERTTEXT,
   DIAGNOSTICS_SENDPACKET,
   METRICSPRIVATE_GETFIELDTRIAL,
-  FILEBROWSERPRIVATE_ZOOM,
+  FILEMANAGERPRIVATE_ZOOM,
   DELETED_WEBVIEW_GO,
   WEBSTOREPRIVATE_ISININCOGNITOMODEFUNCTION,
-  FILEBROWSERPRIVATE_REQUESTACCESSTOKEN,
+  FILEMANAGERPRIVATE_REQUESTACCESSTOKEN,
   DELETED_WEBVIEW_STOP,
   DELETED_WEBVIEW_RELOAD,
   DELETED_WEBVIEW_TERMINATE,
@@ -570,7 +570,7 @@ enum HistogramValue {
   SYSTEM_DISPLAY_GETINFO,
   SYSTEM_DISPLAY_SETDISPLAYPROPERTIES,
   SYSTEM_MEMORY_GETINFO,
-  FILEBROWSERPRIVATE_GETSHAREURL,
+  FILEMANAGERPRIVATE_GETSHAREURL,
   SYSTEM_STORAGE_GETINFO,
   SYSTEM_STORAGE_EJECTDEVICE,
   DELETED_SYSTEM_STORAGE_ADDAVAILABLECAPACITYWATCH,
@@ -617,9 +617,9 @@ enum HistogramValue {
   ECHOPRIVATE_SETOFFERINFO,
   ECHOPRIVATE_GETOFFERINFO,
   DEVELOPERPRIVATE_ISPROFILEMANAGED,
-  FILEBROWSERPRIVATE_INSTALLWEBSTOREITEM,
-  FILEBROWSERPRIVATE_STARTCOPY,
-  FILEBROWSERPRIVATE_CANCELCOPY,
+  FILEMANAGERPRIVATE_INSTALLWEBSTOREITEM,
+  FILEMANAGERPRIVATE_STARTCOPY,
+  FILEMANAGERPRIVATE_CANCELCOPY,
   NETWORKINGPRIVATE_CREATENETWORK,
   BRAILLEDISPLAYPRIVATE_GETDISPLAYSTATE,
   BRAILLEDISPLAYPRIVATE_WRITEDOTS,
@@ -628,7 +628,7 @@ enum HistogramValue {
   USB_OPENDEVICE,
   ACTIVITYLOGPRIVATE_DELETEDATABASE,
   ACTIVITYLOGPRIVATE_DELETEURLS,
-  FILEBROWSERPRIVATE_REQUESTWEBSTOREACCESSTOKEN,
+  FILEMANAGERPRIVATE_REQUESTWEBSTOREACCESSTOKEN,
   IMAGEWRITER_LISTREMOVABLESTORAGEDEVICES,
   WALLPAPER_SETWALLPAPER,
   VIRTUALKEYBOARDPRIVATE_HIDEKEYBOARD,
@@ -726,8 +726,8 @@ enum HistogramValue {
   MEDIAGALLERIES_ADDSCANRESULTS,
   LOGPRIVATE_STARTNETINTERNALSWATCH,
   LOGPRIVATE_STOPNETINTERNALSWATCH,
-  FILEBROWSERPRIVATE_GETPROFILES,
-  FILEBROWSERPRIVATE_VISITDESKTOP,
+  FILEMANAGERPRIVATE_GETPROFILES,
+  FILEMANAGERPRIVATE_VISITDESKTOP,
   VIRTUALKEYBOARDPRIVATE_GETKEYBOARDCONFIG,
   HID_GETDEVICES,
   HID_CONNECT,
@@ -761,7 +761,7 @@ enum HistogramValue {
   APP_CURRENTWINDOWINTERNAL_SETSIZECONSTRAINTS,
   BLUETOOTH_GETDEVICE,
   GCM_UNREGISTER,
-  FILEBROWSERPRIVATE_REQUESTDRIVESHARE,
+  FILEMANAGERPRIVATE_REQUESTDRIVESHARE,
   METRICSPRIVATE_RECORDSPARSEVALUE,
   HOTWORDPRIVATE_SETAUDIOLOGGINGENABLED,
   BLUETOOTHPRIVATE_SETADAPTERSTATE,
@@ -829,7 +829,7 @@ enum HistogramValue {
   SYNCEDNOTIFICATIONSPRIVATE_UPDATENOTIFICATION,
   SYNCEDNOTIFICATIONSPRIVATE_SETRENDERCONTEXT,
   IDENTITY_GETACCOUNTS,
-  FILEBROWSERPRIVATE_RESOLVEISOLATEDENTRIES,
+  FILEMANAGERPRIVATE_RESOLVEISOLATEDENTRIES,
   FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDSUCCESS,
   DELETED_FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDERROR,
   NETWORKINGPRIVATE_GETNETWORKS,
@@ -840,7 +840,7 @@ enum HistogramValue {
   ENTERPRISE_PLATFORMKEYS_GETCERTIFICATES,
   ENTERPRISE_PLATFORMKEYS_IMPORTCERTIFICATE,
   ENTERPRISE_PLATFORMKEYS_REMOVECERTIFICATE,
-  FILEBROWSERPRIVATE_OPENINSPECTOR,
+  FILEMANAGERPRIVATE_OPENINSPECTOR,
   STREAMSPRIVATE_ABORT,
   MANAGEMENT_SETLAUNCHTYPE,
   MANAGEMENT_GENERATEAPPFORLINK,
@@ -899,7 +899,7 @@ enum HistogramValue {
   GCDPRIVATE_GETCOMMANDSLIST,
   APPVIEWINTERNAL_ATTACHFRAME,
   APPVIEWINTERNAL_DENYREQUEST,
-  FILEBROWSERPRIVATE_GETDOWNLOADURL,
+  FILEMANAGERPRIVATE_GETDOWNLOADURL,
   EASYUNLOCKPRIVATE_PERFORMECDHKEYAGREEMENT,
   EASYUNLOCKPRIVATE_GENERATEECP256KEYPAIR,
   EASYUNLOCKPRIVATE_CREATESECUREMESSAGE,
diff --git a/extensions/common/permissions/api_permission.h b/extensions/common/permissions/api_permission.h
index 5974353..d15dee3 100644
--- a/extensions/common/permissions/api_permission.h
+++ b/extensions/common/permissions/api_permission.h
@@ -91,7 +91,7 @@ class APIPermission {
     kFeedbackPrivate,
     kFileBrowserHandler,
     kFileBrowserHandlerInternal,
-    kFileBrowserPrivate,
+    kFileManagerPrivate,
     kFileSystem,
     kFileSystemDirectory,
     kFileSystemProvider,
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index cb3c2d4..f279c36 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -40568,7 +40568,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="1" label="WEBNAVIGATION_GETALLFRAMES"/>
   <int value="2" label="BROWSINGDATA_REMOVEWEBSQL"/>
   <int value="3" label="ALARMS_CREATE"/>
-  <int value="4" label="FILEBROWSERPRIVATE_REMOVEFILEWATCH"/>
+  <int value="4" label="FILEMANAGERPRIVATE_REMOVEFILEWATCH"/>
   <int value="5" label="COOKIES_GET"/>
   <int value="6" label="FONTSETTINGS_GETMINIMUMFONTSIZE"/>
   <int value="7" label="CHROMEOSINFOPRIVATE_GET"/>
@@ -40581,18 +40581,18 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="14" label="DOWNLOADS_CANCEL"/>
   <int value="15" label="BOOKMARKS_CREATE"/>
   <int value="16" label="BOOKMARKS_UPDATE"/>
-  <int value="17" label="FILEBROWSERPRIVATE_GETDRIVEFILES"/>
+  <int value="17" label="FILEMANAGERPRIVATE_GETDRIVEFILES"/>
   <int value="18" label="TERMINALPRIVATE_ONTERMINALRESIZE"/>
-  <int value="19" label="DELETED_FILEBROWSERPRIVATE_REQUESTDIRECTORYREFRESH"/>
+  <int value="19" label="DELETED_FILEMANAGERPRIVATE_REQUESTDIRECTORYREFRESH"/>
   <int value="20" label="BLUETOOTH_GETADAPTERSTATE"/>
-  <int value="21" label="FILEBROWSERPRIVATE_CANCELFILETRANSFERS"/>
-  <int value="22" label="FILEBROWSERPRIVATE_PINDRIVEFILE"/>
+  <int value="21" label="FILEMANAGERPRIVATE_CANCELFILETRANSFERS"/>
+  <int value="22" label="FILEMANAGERPRIVATE_PINDRIVEFILE"/>
   <int value="23" label="SOCKET_WRITE"/>
   <int value="24" label="OMNIBOX_SETDEFAULTSUGGESTION"/>
   <int value="25" label="TTS_SPEAK"/>
   <int value="26" label="WALLPAPERPRIVATE_RESTOREMINIMIZEDWINDOWS"/>
   <int value="27" label="BROWSINGDATA_REMOVEHISTORY"/>
-  <int value="28" label="DELETED_FILEBROWSERPRIVATE_ISFULLSCREEN"/>
+  <int value="28" label="DELETED_FILEMANAGERPRIVATE_ISFULLSCREEN"/>
   <int value="29" label="AUTOTESTPRIVATE_LOGOUT"/>
   <int value="30" label="EXPERIMENTAL_HISTORY_GETMOSTVISITED"/>
   <int value="31" label="DELETED_BLUETOOTH_DISCONNECT"/>
@@ -40617,9 +40617,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="50" label="APP_CURRENTWINDOWINTERNAL_SETBOUNDS"/>
   <int value="51" label="CLOUDPRINTPRIVATE_SETUPCONNECTOR"/>
   <int value="52" label="SERIAL_SETCONTROLSIGNALS"/>
-  <int value="53" label="DELETED_FILEBROWSERPRIVATE_SETLASTMODIFIED"/>
+  <int value="53" label="DELETED_FILEMANAGERPRIVATE_SETLASTMODIFIED"/>
   <int value="54" label="IDLE_SETDETECTIONINTERVAL"/>
-  <int value="55" label="FILEBROWSERPRIVATE_GETFILETASKS"/>
+  <int value="55" label="FILEMANAGERPRIVATE_GETFILETASKS"/>
   <int value="56" label="WEBSTOREPRIVATE_GETSTORELOGIN"/>
   <int value="57" label="SYSTEMPRIVATE_GETINCOGNITOMODEAVAILABILITY"/>
   <int value="58" label="IDLTEST_SENDARRAYBUFFERVIEW"/>
@@ -40638,13 +40638,13 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="71" label="USB_CLOSEDEVICE"/>
   <int value="72" label="TTS_STOP"/>
   <int value="73" label="DELETED_SERIAL_GETPORTS"/>
-  <int value="74" label="DELETED_FILEBROWSERPRIVATE_CLEARDRIVECACHE"/>
+  <int value="74" label="DELETED_FILEMANAGERPRIVATE_CLEARDRIVECACHE"/>
   <int value="75" label="SERIAL_GETCONTROLSIGNALS"/>
   <int value="76" label="DEVELOPERPRIVATE_ENABLE"/>
-  <int value="77" label="FILEBROWSERPRIVATE_GETENTRYPROPERTIES"/>
+  <int value="77" label="FILEMANAGERPRIVATE_GETENTRYPROPERTIES"/>
   <int value="78" label="USB_FINDDEVICES"/>
   <int value="79" label="BOOKMARKMANAGERPRIVATE_DROP"/>
-  <int value="80" label="DELETED_FILEBROWSERPRIVATE_GETFILETRANSFERS"/>
+  <int value="80" label="DELETED_FILEMANAGERPRIVATE_GETFILETRANSFERS"/>
   <int value="81" label="INPUT_IME_SETMENUITEMS"/>
   <int value="82" label="BOOKMARKS_EXPORT"/>
   <int value="83" label="HISTORY_SEARCH"/>
@@ -40672,7 +40672,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="105" label="TERMINALPRIVATE_OPENTERMINALPROCESS"/>
   <int value="106" label="DELETED_SERIAL_CLOSE"/>
   <int value="107" label="CONTEXTMENUS_REMOVE"/>
-  <int value="108" label="FILEBROWSERPRIVATE_REQUESTFILESYSTEM"/>
+  <int value="108" label="FILEMANAGERPRIVATE_REQUESTFILESYSTEM"/>
   <int value="109" label="ECHOPRIVATE_GETREGISTRATIONCODE"/>
   <int value="110" label="TABS_GETCURRENT"/>
   <int value="111" label="FONTSETTINGS_CLEARDEFAULTFIXEDFONTSIZE"/>
@@ -40705,9 +40705,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="138" label="DELETED_BLUETOOTH_GETLOCALOUTOFBANDPAIRINGDATA"/>
   <int value="139" label="SYSTEMPRIVATE_GETUPDATESTATUS"/>
   <int value="140" label="FONTSETTINGS_CLEARMINIMUMFONTSIZE"/>
-  <int value="141" label="DELETED_FILEBROWSERPRIVATE_GETFILELOCATIONS"/>
+  <int value="141" label="DELETED_FILEMANAGERPRIVATE_GETFILELOCATIONS"/>
   <int value="142" label="EXPERIMENTAL_DISCOVERY_SUGGEST"/>
-  <int value="143" label="FILEBROWSERPRIVATE_SETDEFAULTTASK"/>
+  <int value="143" label="FILEMANAGERPRIVATE_SETDEFAULTTASK"/>
   <int value="144" label="BROWSERACTION_GETBADGETEXT"/>
   <int value="145" label="APP_CURRENTWINDOWINTERNAL_HIDE"/>
   <int value="146" label="SOCKET_CONNECT"/>
@@ -40736,7 +40736,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="168" label="TABS_REMOVE"/>
   <int value="169" label="MANAGEMENT_GETPERMISSIONWARNINGSBYID"/>
   <int value="170" label="WINDOWS_GET"/>
-  <int value="171" label="FILEBROWSERPRIVATE_EXECUTETASK"/>
+  <int value="171" label="FILEMANAGERPRIVATE_EXECUTETASK"/>
   <int value="172" label="TTS_GETVOICES"/>
   <int value="173" label="MANAGEMENT_GETALL"/>
   <int value="174" label="MANAGEMENT_GETPERMISSIONWARNINGSBYMANIFEST"/>
@@ -40744,7 +40744,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="176" label="AUTOTESTPRIVATE_SHUTDOWN"/>
   <int value="177" label="FONTSETTINGS_CLEARDEFAULTFONTSIZE"/>
   <int value="178" label="BOOKMARKS_GETTREE"/>
-  <int value="179" label="FILEBROWSERPRIVATE_SELECTFILES"/>
+  <int value="179" label="FILEMANAGERPRIVATE_SELECTFILES"/>
   <int value="180" label="RUNTIME_GETBACKGROUNDPAGE"/>
   <int value="181" label="DELETED_EXPERIMENTAL_RECORD_REPLAYURLS"/>
   <int value="182" label="WEBSTOREPRIVATE_COMPLETEINSTALL"/>
@@ -40755,7 +40755,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="187" label="BROWSINGDATA_REMOVE"/>
   <int value="188" label="DELETED_SERIAL_OPEN"/>
   <int value="189" label="FILESYSTEM_GETDISPLAYPATH"/>
-  <int value="190" label="FILEBROWSERPRIVATE_FORMATVOLUME"/>
+  <int value="190" label="FILEMANAGERPRIVATE_FORMATVOLUME"/>
   <int value="191" label="BOOKMARKS_GET"/>
   <int value="192" label="DELETED_MANAGEDMODEPRIVATE_GET"/>
   <int value="193" label="ALARMS_CLEAR"/>
@@ -40769,7 +40769,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="201" label="CONTENTSETTINGS_GETRESOURCEIDENTIFIERS"/>
   <int value="202" label="SOCKET_CREATE"/>
   <int value="203" label="DEVELOPERPRIVATE_RELOAD"/>
-  <int value="204" label="FILEBROWSERPRIVATE_GETVOLUMEMETADATALIST"/>
+  <int value="204" label="FILEMANAGERPRIVATE_GETVOLUMEMETADATALIST"/>
   <int value="205" label="APP_RUNTIME_POSTINTENTRESPONSE"/>
   <int value="206" label="DELETED_MANAGEDMODEPRIVATE_SETPOLICY"/>
   <int value="207" label="WEBSTOREPRIVATE_BEGININSTALLWITHMANIFEST3"/>
@@ -40777,7 +40777,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="209" label="USB_CONTROLTRANSFER"/>
   <int value="210" label="DELETED_EXPERIMENTAL_SPEECHINPUT_STOP"/>
   <int value="211" label="USB_BULKTRANSFER"/>
-  <int value="212" label="DELETED_FILEBROWSERPRIVATE_GETVOLUMEMETADATA"/>
+  <int value="212" label="DELETED_FILEMANAGERPRIVATE_GETVOLUMEMETADATA"/>
   <int value="213" label="PAGECAPTURE_SAVEASMHTML"/>
   <int value="214" label="EXTENSION_ISALLOWEDINCOGNITOACCESS"/>
   <int value="215" label="BROWSINGDATA_REMOVEAPPCACHE"/>
@@ -40820,7 +40820,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="252" label="TERMINALPRIVATE_SENDINPUT"/>
   <int value="253" label="TABS_HIGHLIGHT"/>
   <int value="254" label="BLUETOOTH_STARTDISCOVERY"/>
-  <int value="255" label="FILEBROWSERPRIVATE_SELECTFILE"/>
+  <int value="255" label="FILEMANAGERPRIVATE_SELECTFILE"/>
   <int value="256" label="WINDOWS_GETCURRENT"/>
   <int value="257" label="DEBUGGER_ATTACH"/>
   <int value="258" label="WALLPAPERPRIVATE_SAVETHUMBNAIL"/>
@@ -40839,7 +40839,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="271" label="BROWSERACTION_GETBADGEBACKGROUNDCOLOR"/>
   <int value="272" label="DELETED_PAGEACTIONS_DISABLEFORTAB"/>
   <int value="273" label="DEVELOPERPRIVATE_ALLOWFILEACCESS"/>
-  <int value="274" label="FILEBROWSERPRIVATE_REMOVEMOUNT"/>
+  <int value="274" label="FILEMANAGERPRIVATE_REMOVEMOUNT"/>
   <int value="275" label="DELETED_BLUETOOTH_CONNECT"/>
   <int value="276" label="TABCAPTURE_CAPTURE"/>
   <int value="277" label="NOTIFICATIONS_CREATE"/>
@@ -40854,7 +40854,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="286" label="BROWSINGDATA_REMOVELOCALSTORAGE"/>
   <int value="287" label="FILEBROWSERHANDLERINTERNAL_SELECTFILE"/>
   <int value="288" label="INPUT_IME_UPDATEMENUITEMS"/>
-  <int value="289" label="FILEBROWSERPRIVATE_GETSTRINGS"/>
+  <int value="289" label="FILEMANAGERPRIVATE_GETSTRINGS"/>
   <int value="290" label="CONTENTSETTINGS_GET"/>
   <int value="291" label="FONTSETTINGS_SETDEFAULTFIXEDFONTSIZE"/>
   <int value="292" label="EXPERIMENTAL_APP_NOTIFY"/>
@@ -40874,16 +40874,16 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="306" label="TYPES_CHROMESETTING_SET"/>
   <int value="307" label="BROWSERACTION_SETICON"/>
   <int value="308" label="EXPERIMENTAL_ACCESSIBILITY_SETACCESSIBILITYENABLED"/>
-  <int value="309" label="DELETED_FILEBROWSERPRIVATE_VIEWFILES"/>
+  <int value="309" label="DELETED_FILEMANAGERPRIVATE_VIEWFILES"/>
   <int value="310" label="DELETED_BLUETOOTH_GETSERVICES"/>
   <int value="311" label="TABS_UPDATE"/>
   <int value="312" label="BROWSINGDATA_REMOVEFORMDATA"/>
-  <int value="313" label="DELETED_FILEBROWSERPRIVATE_RELOADDRIVE"/>
+  <int value="313" label="DELETED_FILEMANAGERPRIVATE_RELOADDRIVE"/>
   <int value="314" label="ALARMS_GET"/>
   <int value="315" label="BROWSINGDATA_REMOVEINDEXEDDB"/>
-  <int value="316" label="FILEBROWSERPRIVATE_ADDFILEWATCH"/>
+  <int value="316" label="FILEMANAGERPRIVATE_ADDFILEWATCH"/>
   <int value="317" label="CONTENTSETTINGS_CLEAR"/>
-  <int value="318" label="FILEBROWSERPRIVATE_GETPREFERENCES"/>
+  <int value="318" label="FILEMANAGERPRIVATE_GETPREFERENCES"/>
   <int value="319" label="BOOKMARKMANAGERPRIVATE_PASTE"/>
   <int value="320" label="FILESYSTEM_ISWRITABLEENTRY"/>
   <int value="321" label="USB_SETINTERFACEALTERNATESETTING"/>
@@ -40893,12 +40893,12 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="325" label="BLUETOOTH_GETDEVICES"/>
   <int value="326" label="ALARMS_CLEARALL"/>
   <int value="327" label="FONTSETTINGS_GETDEFAULTFIXEDFONTSIZE"/>
-  <int value="328" label="FILEBROWSERPRIVATE_ZIPSELECTION"/>
+  <int value="328" label="FILEMANAGERPRIVATE_ZIPSELECTION"/>
   <int value="329" label="SYSTEMINDICATOR_DISABLE"/>
   <int value="330" label="DELETED_SCRIPTBADGE_SETPOPUP"/>
   <int value="331" label="EXTENSION_ISALLOWEDFILESCHEMEACCESS"/>
   <int value="332" label="EXPERIMENTAL_IDENTITY_LAUNCHWEBAUTHFLOW"/>
-  <int value="333" label="FILEBROWSERPRIVATE_GETDRIVECONNECTIONSTATE"/>
+  <int value="333" label="FILEMANAGERPRIVATE_GETDRIVECONNECTIONSTATE"/>
   <int value="334" label="TABS_DETECTLANGUAGE"/>
   <int value="335" label="METRICSPRIVATE_RECORDVALUE"/>
   <int value="336" label="BOOKMARKMANAGERPRIVATE_SORTCHILDREN"/>
@@ -40906,7 +40906,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="338" label="APP_CURRENTWINDOWINTERNAL_MAXIMIZE"/>
   <int value="339" label="EXPERIMENTAL_DISCOVERY_CLEARALLSUGGESTIONS"/>
   <int value="340" label="DELETED_MANAGEDMODEPRIVATE_ENTER"/>
-  <int value="341" label="DELETED_FILEBROWSERPRIVATE_TRANSFERFILE"/>
+  <int value="341" label="DELETED_FILEMANAGERPRIVATE_TRANSFERFILE"/>
   <int value="342" label="BROWSERACTION_SETPOPUP"/>
   <int value="343" label="TABS_GETSELECTED"/>
   <int value="344" label="FONTSETTINGS_GETFONT"/>
@@ -40919,9 +40919,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="351" label="DELETED_EXPERIMENTAL_RECORD_CAPTUREURLS"/>
   <int value="352" label="TTS_ISSPEAKING"/>
   <int value="353" label="BOOKMARKS_REMOVETREE"/>
-  <int value="354" label="FILEBROWSERPRIVATE_SEARCHDRIVE"/>
+  <int value="354" label="FILEMANAGERPRIVATE_SEARCHDRIVE"/>
   <int value="355" label="DELETED_EXPERIMENTAL_SYSTEMINFO_CPU_GET"/>
-  <int value="356" label="FILEBROWSERPRIVATE_SETPREFERENCES"/>
+  <int value="356" label="FILEMANAGERPRIVATE_SETPREFERENCES"/>
   <int value="357" label="FONTSETTINGS_SETFONT"/>
   <int value="358" label="SOCKET_GETNETWORKLIST"/>
   <int value="359" label="BOOKMARKS_MOVE"/>
@@ -40929,7 +40929,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="361" label="STORAGE_REMOVE"/>
   <int value="362" label="AUTOTESTPRIVATE_LOGINSTATUS"/>
   <int value="363" label="TABS_CREATE"/>
-  <int value="364" label="FILEBROWSERPRIVATE_CANCELDIALOG"/>
+  <int value="364" label="FILEMANAGERPRIVATE_CANCELDIALOG"/>
   <int value="365" label="BROWSINGDATA_REMOVECOOKIES"/>
   <int value="366" label="FILESYSTEM_CHOOSEENTRY"/>
   <int value="367" label="MEDIAPLAYERPRIVATE_PLAY"/>
@@ -40945,19 +40945,19 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="377" label="RUNTIME_RELOAD"/>
   <int value="378" label="EXPERIMENTAL_POWER_REQUESTKEEPAWAKE"/>
   <int value="379" label="SYSTEMINDICATOR_SETICON"/>
-  <int value="380" label="FILEBROWSERPRIVATE_ADDMOUNT"/>
+  <int value="380" label="FILEMANAGERPRIVATE_ADDMOUNT"/>
   <int value="381" label="APP_CURRENTWINDOWINTERNAL_FOCUS"/>
   <int value="382" label="EVENTS_REMOVERULES"/>
   <int value="383" label="DOWNLOADS_DOWNLOAD"/>
   <int value="384" label="WINDOWS_GETALL"/>
-  <int value="385" label="DELETED_FILEBROWSERPRIVATE_TOGGLEFULLSCREEN"/>
+  <int value="385" label="DELETED_FILEMANAGERPRIVATE_TOGGLEFULLSCREEN"/>
   <int value="386" label="APP_CURRENTWINDOWINTERNAL_RESTORE"/>
   <int value="387" label="DELETED_WEBSOCKETPROXYPRIVATE_GETPASSPORTFORTCP"/>
   <int value="388" label="PAGEACTION_HIDE"/>
   <int value="389" label="DELETED_EXPERIMENTAL_SYSTEMINFO_STORAGE_GET"/>
   <int value="390" label="DOWNLOADS_ACCEPTDANGER"/>
   <int value="391" label="DELETED_WEBSOCKETPROXYPRIVATE_GETURLFORTCP"/>
-  <int value="392" label="FILEBROWSERPRIVATE_GETSIZESTATS"/>
+  <int value="392" label="FILEMANAGERPRIVATE_GETSIZESTATS"/>
   <int value="393" label="DOWNLOADS_RESUME"/>
   <int value="394" label="COOKIES_GETALLCOOKIESTORES"/>
   <int value="395" label="MEDIAGALLERIESPRIVATE_ADDGALLERYWATCH"/>
@@ -40969,7 +40969,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="401" label="DELETED_SESSIONRESTORE_RESTORE"/>
   <int value="402" label="MANAGEMENT_UNINSTALLSELF"/>
   <int value="403" label="ECHOPRIVATE_GETOOBETIMESTAMP"/>
-  <int value="404" label="FILEBROWSERPRIVATE_VALIDATEPATHNAMELENGTH"/>
+  <int value="404" label="FILEMANAGERPRIVATE_VALIDATEPATHNAMELENGTH"/>
   <int value="405" label="BROWSINGDATA_SETTINGS"/>
   <int value="406" label="WEBSTOREPRIVATE_GETISLAUNCHERENABLED"/>
   <int value="407" label="NETWORKINGPRIVATE_GETPROPERTIES"/>
@@ -40978,10 +40978,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="410" label="NETWORKINGPRIVATE_STARTDISCONNECT"/>
   <int value="411" label="MEDIAGALLERIESPRIVATE_GETALLGALLERYWATCH"/>
   <int value="412" label="MEDIAGALLERIESPRIVATE_REMOVEALLGALLERYWATCH"/>
-  <int value="413" label="FILEBROWSERPRIVATE_SEARCHDRIVEMETADATA"/>
+  <int value="413" label="FILEMANAGERPRIVATE_SEARCHDRIVEMETADATA"/>
   <int value="414" label="DELETED_ECHOPRIVATE_CHECKALLOWREDEEMOFFERS"/>
   <int value="415" label="DELETED_MEDIAGALLERIESPRIVATE_EJECTDEVICE"/>
-  <int value="416" label="FILEBROWSERPRIVATE_LOGOUTUSERFORREAUTHENTICATION"/>
+  <int value="416" label="FILEMANAGERPRIVATE_LOGOUTUSERFORREAUTHENTICATION"/>
   <int value="417" label="DEVELOPERPRIVATE_CHOOSEPATH"/>
   <int value="418" label="DEVELOPERPRIVATE_PACKDIRECTORY"/>
   <int value="419" label="NETWORKINGPRIVATE_VERIFYDESTINATION"/>
@@ -40990,7 +40990,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="422" label="DEVELOPERPRIVATE_RESTART"/>
   <int value="423" label="DEVELOPERPRIVATE_ALLOWINCOGNITO"/>
   <int value="424" label="INPUT_IME_DELETESURROUNDINGTEXT"/>
-  <int value="425" label="DELETED_FILEBROWSERPRIVATE_OPENNEWWINDOW"/>
+  <int value="425" label="DELETED_FILEMANAGERPRIVATE_OPENNEWWINDOW"/>
   <int value="426" label="CLOUDPRINTPRIVATE_GETCLIENTID"/>
   <int value="427" label="ECHOPRIVATE_GETUSERCONSENT"/>
   <int value="428" label="SYNCFILESYSTEM_SETCONFLICTRESOLUTIONPOLICY"/>
@@ -41063,10 +41063,10 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="493" label="VIRTUALKEYBOARDPRIVATE_INSERTTEXT"/>
   <int value="494" label="DIAGNOSTICS_SENDPACKET"/>
   <int value="495" label="METRICSPRIVATE_GETFIELDTRIAL"/>
-  <int value="496" label="FILEBROWSERPRIVATE_ZOOM"/>
+  <int value="496" label="FILEMANAGERPRIVATE_ZOOM"/>
   <int value="497" label="DELETED_WEBVIEW_GO"/>
   <int value="498" label="WEBSTOREPRIVATE_ISININCOGNITOMODEFUNCTION"/>
-  <int value="499" label="FILEBROWSERPRIVATE_REQUESTACCESSTOKEN"/>
+  <int value="499" label="FILEMANAGERPRIVATE_REQUESTACCESSTOKEN"/>
   <int value="500" label="DELETED_WEBVIEW_STOP"/>
   <int value="501" label="DELETED_WEBVIEW_RELOAD"/>
   <int value="502" label="DELETED_WEBVIEW_TERMINATE"/>
@@ -41079,7 +41079,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="509" label="SYSTEM_DISPLAY_GETINFO"/>
   <int value="510" label="SYSTEM_DISPLAY_SETDISPLAYPROPERTIES"/>
   <int value="511" label="SYSTEM_MEMORY_GETINFO"/>
-  <int value="512" label="FILEBROWSERPRIVATE_GETSHAREURL"/>
+  <int value="512" label="FILEMANAGERPRIVATE_GETSHAREURL"/>
   <int value="513" label="SYSTEM_STORAGE_GETINFO"/>
   <int value="514" label="SYSTEM_STORAGE_EJECTDEVICE"/>
   <int value="515" label="DELETED_SYSTEM_STORAGE_ADDAVAILABLECAPACITYWATCH"/>
@@ -41128,9 +41128,9 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="556" label="ECHOPRIVATE_SETOFFERINFO"/>
   <int value="557" label="ECHOPRIVATE_GETOFFERINFO"/>
   <int value="558" label="DEVELOPERPRIVATE_ISPROFILEMANAGED"/>
-  <int value="559" label="FILEBROWSERPRIVATE_INSTALLWEBSTOREITEM"/>
-  <int value="560" label="FILEBROWSERPRIVATE_STARTCOPY"/>
-  <int value="561" label="FILEBROWSERPRIVATE_CANCELCOPY"/>
+  <int value="559" label="FILEMANAGERPRIVATE_INSTALLWEBSTOREITEM"/>
+  <int value="560" label="FILEMANAGERPRIVATE_STARTCOPY"/>
+  <int value="561" label="FILEMANAGERPRIVATE_CANCELCOPY"/>
   <int value="562" label="NETWORKINGPRIVATE_CREATENETWORK"/>
   <int value="563" label="BRAILLEDISPLAYPRIVATE_GETDISPLAYSTATE"/>
   <int value="564" label="BRAILLEDISPLAYPRIVATE_WRITEDOTS"/>
@@ -41139,7 +41139,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="567" label="USB_OPENDEVICE"/>
   <int value="568" label="ACTIVITYLOGPRIVATE_DELETEDATABASE"/>
   <int value="569" label="ACTIVITYLOGPRIVATE_DELETEURLS"/>
-  <int value="570" label="FILEBROWSERPRIVATE_REQUESTWEBSTOREACCESSTOKEN"/>
+  <int value="570" label="FILEMANAGERPRIVATE_REQUESTWEBSTOREACCESSTOKEN"/>
   <int value="571" label="IMAGEWRITER_LISTREMOVABLESTORAGEDEVICES"/>
   <int value="572" label="WALLPAPER_SETWALLPAPER"/>
   <int value="573" label="VIRTUALKEYBOARDPRIVATE_HIDEKEYBOARD"/>
@@ -41238,8 +41238,8 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="665" label="MEDIAGALLERIES_ADDSCANRESULTS"/>
   <int value="666" label="LOGPRIVATE_STARTNETINTERNALSWATCH"/>
   <int value="667" label="LOGPRIVATE_STOPNETINTERNALSWATCH"/>
-  <int value="668" label="FILEBROWSERPRIVATE_GETPROFILES"/>
-  <int value="669" label="FILEBROWSERPRIVATE_VISITDESKTOP"/>
+  <int value="668" label="FILEMANAGERPRIVATE_GETPROFILES"/>
+  <int value="669" label="FILEMANAGERPRIVATE_VISITDESKTOP"/>
   <int value="670" label="VIRTUALKEYBOARDPRIVATE_GETKEYBOARDCONFIG"/>
   <int value="671" label="HID_GETDEVICES"/>
   <int value="672" label="HID_CONNECT"/>
@@ -41273,7 +41273,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="700" label="APP_CURRENTWINDOWINTERNAL_SETSIZECONSTRAINTS"/>
   <int value="701" label="BLUETOOTH_GETDEVICE"/>
   <int value="702" label="GCM_UNREGISTER"/>
-  <int value="703" label="FILEBROWSERPRIVATE_REQUESTDRIVESHARE"/>
+  <int value="703" label="FILEMANAGERPRIVATE_REQUESTDRIVESHARE"/>
   <int value="704" label="METRICSPRIVATE_RECORDSPARSEVALUE"/>
   <int value="705" label="HOTWORDPRIVATE_SETAUDIOLOGGINGENABLED"/>
   <int value="706" label="BLUETOOTHPRIVATE_SETADAPTERSTATE"/>
@@ -41350,7 +41350,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="768" label="SYNCEDNOTIFICATIONSPRIVATE_UPDATENOTIFICATION"/>
   <int value="769" label="SYNCEDNOTIFICATIONSPRIVATE_SETRENDERCONTEXT"/>
   <int value="770" label="IDENTITY_GETACCOUNTS"/>
-  <int value="771" label="FILEBROWSERPRIVATE_RESOLVEISOLATEDENTRIES"/>
+  <int value="771" label="FILEMANAGERPRIVATE_RESOLVEISOLATEDENTRIES"/>
   <int value="772" label="FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDSUCCESS"/>
   <int value="773"
       label="DELETED_FILESYSTEMPROVIDERINTERNAL_READFILEREQUESTEDERROR"/>
@@ -41362,7 +41362,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="779" label="ENTERPRISE_PLATFORMKEYS_GETCERTIFICATES"/>
   <int value="780" label="ENTERPRISE_PLATFORMKEYS_IMPORTCERTIFICATE"/>
   <int value="781" label="ENTERPRISE_PLATFORMKEYS_REMOVECERTIFICATE"/>
-  <int value="782" label="FILEBROWSERPRIVATE_OPENINSPECTOR"/>
+  <int value="782" label="FILEMANAGERPRIVATE_OPENINSPECTOR"/>
   <int value="783" label="STREAMSPRIVATE_ABORT"/>
   <int value="784" label="MANAGEMENT_SETLAUNCHTYPE"/>
   <int value="785" label="MANAGEMENT_GENERATEAPPFORLINK"/>
@@ -41422,7 +41422,7 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="838" label="GCDPRIVATE_GETCOMMANDSLIST"/>
   <int value="839" label="APPVIEWINTERNAL_ATTACHFRAME"/>
   <int value="840" label="APPVIEWINTERNAL_DENYREQUEST"/>
-  <int value="841" label="FILEBROWSERPRIVATE_GETDOWNLOADURL"/>
+  <int value="841" label="FILEMANAGERPRIVATE_GETDOWNLOADURL"/>
   <int value="842" label="EASYUNLOCKPRIVATE_PERFORMECDHKEYAGREEMENT"/>
   <int value="843" label="EASYUNLOCKPRIVATE_GENERATEECP256KEYPAIR"/>
   <int value="844" label="EASYUNLOCKPRIVATE_CREATESECUREMESSAGE"/>
diff --git a/ui/file_manager/file_manager/audio_player/js/audio_player.js b/ui/file_manager/file_manager/audio_player/js/audio_player.js
index c4b3a7c..cb4aa7c 100644
--- a/ui/file_manager/file_manager/audio_player/js/audio_player.js
+++ b/ui/file_manager/file_manager/audio_player/js/audio_player.js
@@ -44,7 +44,7 @@ function AudioPlayer(container) {
 
   this.errorString_ = '';
   this.offlineString_ = '';
-  chrome.fileBrowserPrivate.getStrings(function(strings) {
+  chrome.fileManagerPrivate.getStrings(function(strings) {
     container.ownerDocument.title = strings['AUDIO_PLAYER_TITLE'];
     this.errorString_ = strings['AUDIO_ERROR'];
     this.offlineString_ = strings['AUDIO_OFFLINE'];
diff --git a/ui/file_manager/file_manager/background/js/background.js b/ui/file_manager/file_manager/background/js/background.js
index 57239b6..a38eca3 100644
--- a/ui/file_manager/file_manager/background/js/background.js
+++ b/ui/file_manager/file_manager/background/js/background.js
@@ -83,7 +83,7 @@ function Background() {
    * @type {Promise}
    */
   this.stringDataPromise = new Promise(function(fulfill) {
-    chrome.fileBrowserPrivate.getStrings(fulfill);
+    chrome.fileManagerPrivate.getStrings(fulfill);
   });
 
   /**
@@ -291,14 +291,14 @@ AppWindowWrapper.focusOnDesktop = function(appWindow, opt_profileId) {
     if (opt_profileId) {
       onFulfilled(opt_profileId);
     } else {
-      chrome.fileBrowserPrivate.getProfiles(function(profiles,
+      chrome.fileManagerPrivate.getProfiles(function(profiles,
                                                      currentId,
                                                      displayedId) {
         onFulfilled(currentId);
       });
     }
   }).then(function(profileId) {
-    appWindow.contentWindow.chrome.fileBrowserPrivate.visitDesktop(
+    appWindow.contentWindow.chrome.fileManagerPrivate.visitDesktop(
         profileId, function() {
       appWindow.focus();
     });
diff --git a/ui/file_manager/file_manager/background/js/device_handler.js b/ui/file_manager/file_manager/background/js/device_handler.js
index 04396ef..66ddc52 100644
--- a/ui/file_manager/file_manager/background/js/device_handler.js
+++ b/ui/file_manager/file_manager/background/js/device_handler.js
@@ -27,9 +27,9 @@ function DeviceHandler() {
    */
   this.navigationVolumes_ = {};
 
-  chrome.fileBrowserPrivate.onDeviceChanged.addListener(
+  chrome.fileManagerPrivate.onDeviceChanged.addListener(
       this.onDeviceChanged_.bind(this));
-  chrome.fileBrowserPrivate.onMountCompleted.addListener(
+  chrome.fileManagerPrivate.onMountCompleted.addListener(
       this.onMountCompleted_.bind(this));
   chrome.notifications.onButtonClicked.addListener(
       this.onNotificationButtonClicked_.bind(this));
diff --git a/ui/file_manager/file_manager/background/js/drive_sync_handler.js b/ui/file_manager/file_manager/background/js/drive_sync_handler.js
index 18de22d..b0182c2 100644
--- a/ui/file_manager/file_manager/background/js/drive_sync_handler.js
+++ b/ui/file_manager/file_manager/background/js/drive_sync_handler.js
@@ -48,9 +48,9 @@ function DriveSyncHandler(progressCenter) {
   this.queue_ = new AsyncUtil.Queue();
 
   // Register events.
-  chrome.fileBrowserPrivate.onFileTransfersUpdated.addListener(
+  chrome.fileManagerPrivate.onFileTransfersUpdated.addListener(
       this.onFileTransfersUpdated_.bind(this));
-  chrome.fileBrowserPrivate.onDriveSyncError.addListener(
+  chrome.fileManagerPrivate.onDriveSyncError.addListener(
       this.onDriveSyncError_.bind(this));
 }
 
@@ -152,7 +152,7 @@ DriveSyncHandler.prototype.removeItem_ = function(status) {
  * @private
  */
 DriveSyncHandler.prototype.requestCancel_ = function(entry) {
-  chrome.fileBrowserPrivate.cancelFileTransfers([entry.toURL()], function() {});
+  chrome.fileManagerPrivate.cancelFileTransfers([entry.toURL()], function() {});
 };
 
 /**
diff --git a/ui/file_manager/file_manager/background/js/file_operation_manager.js b/ui/file_manager/file_manager/background/js/file_operation_manager.js
index 516f9cf..d66e782 100644
--- a/ui/file_manager/file_manager/background/js/file_operation_manager.js
+++ b/ui/file_manager/file_manager/background/js/file_operation_manager.js
@@ -261,7 +261,7 @@ fileOperationUtil.copyTo = function(
           break;
 
         case 'success':
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(
               onCopyProgress);
           // TODO(mtomasz): Convert URL to Entry in custom bindings.
           util.URLsToEntries(
@@ -272,7 +272,7 @@ fileOperationUtil.copyTo = function(
           break;
 
         case 'error':
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(
               onCopyProgress);
           errorCallback(util.createDOMError(status.error));
           callback();
@@ -281,9 +281,9 @@ fileOperationUtil.copyTo = function(
         default:
           // Found unknown state. Cancel the task, and return an error.
           console.error('Unknown progress type: ' + status.type);
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(
               onCopyProgress);
-          chrome.fileBrowserPrivate.cancelCopy(copyId);
+          chrome.fileManagerPrivate.cancelCopy(copyId);
           errorCallback(util.createDOMError(
               util.FileError.INVALID_STATE_ERR));
           callback();
@@ -293,16 +293,16 @@ fileOperationUtil.copyTo = function(
 
   // Register the listener before calling startCopy. Otherwise some events
   // would be lost.
-  chrome.fileBrowserPrivate.onCopyProgress.addListener(onCopyProgress);
+  chrome.fileManagerPrivate.onCopyProgress.addListener(onCopyProgress);
 
   // Then starts the copy.
   // TODO(mtomasz): Convert URL to Entry in custom bindings.
-  chrome.fileBrowserPrivate.startCopy(
+  chrome.fileManagerPrivate.startCopy(
       source.toURL(), parent.toURL(), newName, function(startCopyId) {
         // last error contains the FileError code on error.
         if (chrome.runtime.lastError) {
           // Unsubscribe the progress listener.
-          chrome.fileBrowserPrivate.onCopyProgress.removeListener(
+          chrome.fileManagerPrivate.onCopyProgress.removeListener(
               onCopyProgress);
           errorCallback(util.createDOMError(chrome.runtime.lastError));
           return;
@@ -318,17 +318,17 @@ fileOperationUtil.copyTo = function(
     // If copyId is not yet available, wait for it.
     if (copyId == null) {
       pendingCallbacks.push(function() {
-        chrome.fileBrowserPrivate.cancelCopy(copyId);
+        chrome.fileManagerPrivate.cancelCopy(copyId);
       });
       return;
     }
 
-    chrome.fileBrowserPrivate.cancelCopy(copyId);
+    chrome.fileManagerPrivate.cancelCopy(copyId);
   };
 };
 
 /**
- * Thin wrapper of chrome.fileBrowserPrivate.zipSelection to adapt its
+ * Thin wrapper of chrome.fileManagerPrivate.zipSelection to adapt its
  * interface similar to copyTo().
  *
  * @param {Array.<Entry>} sources The array of entries to be archived.
@@ -343,7 +343,7 @@ fileOperationUtil.zipSelection = function(
     sources, parent, newName, successCallback, errorCallback) {
   // TODO(mtomasz): Move conversion from entry to url to custom bindings.
   // crbug.com/345527.
-  chrome.fileBrowserPrivate.zipSelection(
+  chrome.fileManagerPrivate.zipSelection(
       parent.toURL(),
       util.entriesToURLs(sources),
       newName, function(success) {
diff --git a/ui/file_manager/file_manager/background/js/test_util.js b/ui/file_manager/file_manager/background/js/test_util.js
index a6d228a..6b92b3b 100644
--- a/ui/file_manager/file_manager/background/js/test_util.js
+++ b/ui/file_manager/file_manager/background/js/test_util.js
@@ -579,7 +579,7 @@ test.util.sync.overrideInstallWebstoreItemApi =
   };
 
   test.util.executedTasks_ = [];
-  contentWindow.chrome.fileBrowserPrivate.installWebstoreItem =
+  contentWindow.chrome.fileManagerPrivate.installWebstoreItem =
       installWebstoreItem;
   return true;
 };
@@ -589,7 +589,7 @@ test.util.sync.overrideInstallWebstoreItemApi =
  *
  * @param {Window} contentWindow Window to be tested.
  * @param {Array.<Object>} taskList List of tasks to be returned in
- *     fileBrowserPrivate.getFileTasks().
+ *     fileManagerPrivate.getFileTasks().
  * @return {boolean} Always return true.
  */
 test.util.sync.overrideTasks = function(contentWindow, taskList) {
@@ -611,9 +611,9 @@ test.util.sync.overrideTasks = function(contentWindow, taskList) {
   };
 
   test.util.executedTasks_ = [];
-  contentWindow.chrome.fileBrowserPrivate.getFileTasks = getFileTasks;
-  contentWindow.chrome.fileBrowserPrivate.executeTask = executeTask;
-  contentWindow.chrome.fileBrowserPrivate.setDefaultTask = setDefaultTask;
+  contentWindow.chrome.fileManagerPrivate.getFileTasks = getFileTasks;
+  contentWindow.chrome.fileManagerPrivate.executeTask = executeTask;
+  contentWindow.chrome.fileManagerPrivate.setDefaultTask = setDefaultTask;
   return true;
 };
 
@@ -631,7 +631,7 @@ test.util.sync.getExecutedTasks = function(contentWindow) {
 };
 
 /**
- * Invoke chrome.fileBrowserPrivate.visitDesktop(profileId) to cause window
+ * Invoke chrome.fileManagerPrivate.visitDesktop(profileId) to cause window
  * teleportation.
  *
  * @param {Window} contentWindow Window to be tested.
@@ -639,7 +639,7 @@ test.util.sync.getExecutedTasks = function(contentWindow) {
  * @return {boolean} Always return true.
  */
 test.util.sync.visitDesktop = function(contentWindow, profileId) {
-  contentWindow.chrome.fileBrowserPrivate.visitDesktop(profileId);
+  contentWindow.chrome.fileManagerPrivate.visitDesktop(profileId);
   return true;
 };
 
diff --git a/ui/file_manager/file_manager/background/js/volume_manager.js b/ui/file_manager/file_manager/background/js/volume_manager.js
index 1abcec0..050f342 100644
--- a/ui/file_manager/file_manager/background/js/volume_manager.js
+++ b/ui/file_manager/file_manager/background/js/volume_manager.js
@@ -221,7 +221,7 @@ volumeManagerUtil.createVolumeInfo = function(volumeMetadata, callback) {
       break;
   }
 
-  chrome.fileBrowserPrivate.requestFileSystem(
+  chrome.fileManagerPrivate.requestFileSystem(
       volumeMetadata.volumeId,
       function(fileSystem) {
         // TODO(mtomasz): chrome.runtime.lastError should have error reason.
@@ -448,7 +448,7 @@ function VolumeManager() {
     reason: VolumeManagerCommon.DriveConnectionReason.NO_SERVICE
   };
 
-  chrome.fileBrowserPrivate.onDriveConnectionStatusChanged.addListener(
+  chrome.fileManagerPrivate.onDriveConnectionStatusChanged.addListener(
       this.onDriveConnectionStatusChanged_.bind(this));
   this.onDriveConnectionStatusChanged_();
 }
@@ -458,7 +458,7 @@ function VolumeManager() {
  * @private_
  */
 VolumeManager.prototype.onDriveConnectionStatusChanged_ = function() {
-  chrome.fileBrowserPrivate.getDriveConnectionState(function(state) {
+  chrome.fileManagerPrivate.getDriveConnectionState(function(state) {
     this.driveConnectionState_ = state;
     cr.dispatchSimpleEvent(this, 'drive-connection-changed');
   }.bind(this));
@@ -531,7 +531,7 @@ VolumeManager.getInstance = function(callback) {
  * @private
  */
 VolumeManager.prototype.initialize_ = function(callback) {
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     // We must subscribe to the mount completed event in the callback of
     // getVolumeMetadataList. crbug.com/330061.
     // But volumes reported by onMountCompleted events must be added after the
@@ -561,7 +561,7 @@ VolumeManager.prototype.initialize_ = function(callback) {
       });
     }.bind(this));
 
-    chrome.fileBrowserPrivate.onMountCompleted.addListener(
+    chrome.fileManagerPrivate.onMountCompleted.addListener(
         this.onMountCompleted_.bind(this));
   }.bind(this));
 };
@@ -657,7 +657,7 @@ VolumeManager.prototype.makeRequestKey_ = function(requestType, argument) {
  */
 VolumeManager.prototype.mountArchive = function(
     fileUrl, successCallback, errorCallback) {
-  chrome.fileBrowserPrivate.addMount(fileUrl, function(sourcePath) {
+  chrome.fileManagerPrivate.addMount(fileUrl, function(sourcePath) {
     console.info(
         'Mount request: url=' + fileUrl + '; sourcePath=' + sourcePath);
     var requestKey = this.makeRequestKey_('mount', sourcePath);
@@ -675,7 +675,7 @@ VolumeManager.prototype.mountArchive = function(
 VolumeManager.prototype.unmount = function(volumeInfo,
                                            successCallback,
                                            errorCallback) {
-  chrome.fileBrowserPrivate.removeMount(volumeInfo.volumeId);
+  chrome.fileManagerPrivate.removeMount(volumeInfo.volumeId);
   var requestKey = this.makeRequestKey_('unmount', volumeInfo.volumeId);
   this.startRequest_(requestKey, successCallback, errorCallback);
 };
diff --git a/ui/file_manager/file_manager/common/js/util.js b/ui/file_manager/file_manager/common/js/util.js
index b548b4f..5e3e940 100644
--- a/ui/file_manager/file_manager/common/js/util.js
+++ b/ui/file_manager/file_manager/common/js/util.js
@@ -1152,7 +1152,7 @@ util.URLsToEntries = function(urls, opt_callback) {
  */
 util.isTeleported = function(window) {
   return new Promise(function(onFulfilled) {
-    window.chrome.fileBrowserPrivate.getProfiles(function(profiles,
+    window.chrome.fileManagerPrivate.getProfiles(function(profiles,
                                                           currentId,
                                                           displayedId) {
       onFulfilled(currentId !== displayedId);
@@ -1171,7 +1171,7 @@ util.isTeleported = function(window) {
 util.showOpenInOtherDesktopAlert = function(alertDialog, entries) {
   if (!entries.length)
     return;
-  chrome.fileBrowserPrivate.getProfiles(function(profiles,
+  chrome.fileManagerPrivate.getProfiles(function(profiles,
                                                  currentId,
                                                  displayedId) {
     // Find strings.
@@ -1347,7 +1347,7 @@ util.validateFileName = function(parentEntry, name, filterHiddenOn) {
     return Promise.reject(str('ERROR_HIDDEN_NAME'));
 
   return new Promise(function(fulfill, reject) {
-    chrome.fileBrowserPrivate.validatePathNameLength(
+    chrome.fileManagerPrivate.validatePathNameLength(
         parentEntry.toURL(),
         name,
         function(valid) {
diff --git a/ui/file_manager/file_manager/foreground/js/app_installer.js b/ui/file_manager/file_manager/foreground/js/app_installer.js
index ce3ff70..3722480 100644
--- a/ui/file_manager/file_manager/foreground/js/app_installer.js
+++ b/ui/file_manager/file_manager/foreground/js/app_installer.js
@@ -50,7 +50,7 @@ AppInstaller.USER_CANCELLED_ERROR_STR_ = 'User cancelled install';
  */
 AppInstaller.prototype.install = function(callback) {
   this.callback_ = callback;
-  chrome.fileBrowserPrivate.installWebstoreItem(
+  chrome.fileManagerPrivate.installWebstoreItem(
       this.itemId_,
       false,  // Shows installation prompt.
       function() {
diff --git a/ui/file_manager/file_manager/foreground/js/directory_contents.js b/ui/file_manager/file_manager/foreground/js/directory_contents.js
index 0abf9ee..dd275bd 100644
--- a/ui/file_manager/file_manager/foreground/js/directory_contents.js
+++ b/ui/file_manager/file_manager/foreground/js/directory_contents.js
@@ -131,7 +131,7 @@ DriveSearchContentScanner.prototype.scan = function(
     entriesCallback, successCallback, errorCallback) {
   var numReadEntries = 0;
   var readEntries = function(nextFeed) {
-    chrome.fileBrowserPrivate.searchDrive(
+    chrome.fileManagerPrivate.searchDrive(
         {query: this.query_, nextFeed: nextFeed},
         function(entries, nextFeed) {
           if (this.cancelled_) {
@@ -292,7 +292,7 @@ DriveMetadataSearchContentScanner.SearchType = Object.freeze({
  */
 DriveMetadataSearchContentScanner.prototype.scan = function(
     entriesCallback, successCallback, errorCallback) {
-  chrome.fileBrowserPrivate.searchDriveMetadata(
+  chrome.fileManagerPrivate.searchDriveMetadata(
       {query: '', types: this.searchType_, maxResults: 500},
       function(results) {
         if (this.cancelled_) {
diff --git a/ui/file_manager/file_manager/foreground/js/directory_tree.js b/ui/file_manager/file_manager/foreground/js/directory_tree.js
index ee46edf..7b447df 100644
--- a/ui/file_manager/file_manager/foreground/js/directory_tree.js
+++ b/ui/file_manager/file_manager/foreground/js/directory_tree.js
@@ -984,7 +984,7 @@ DirectoryTree.prototype.decorate = function(
 
   this.privateOnDirectoryChangedBound_ =
       this.onDirectoryContentChanged_.bind(this);
-  chrome.fileBrowserPrivate.onDirectoryChanged.addListener(
+  chrome.fileManagerPrivate.onDirectoryChanged.addListener(
       this.privateOnDirectoryChangedBound_);
 
   this.scrollBar_ = new MainPanelScrollBar();
diff --git a/ui/file_manager/file_manager/foreground/js/drive_banners.js b/ui/file_manager/file_manager/foreground/js/drive_banners.js
index 33946c3..d0d53c0 100644
--- a/ui/file_manager/file_manager/foreground/js/drive_banners.js
+++ b/ui/file_manager/file_manager/foreground/js/drive_banners.js
@@ -54,7 +54,7 @@ function FileListBannerController(
   var authFailedText = this.authFailedBanner_.querySelector('.drive-text');
   authFailedText.innerHTML = util.htmlUnescape(str('DRIVE_NOT_REACHED'));
   authFailedText.querySelector('a').addEventListener('click', function(e) {
-    chrome.fileBrowserPrivate.logoutUserForReauthentication();
+    chrome.fileManagerPrivate.logoutUserForReauthentication();
     e.preventDefault();
   });
   this.maybeShowAuthFailBanner_();
@@ -347,7 +347,7 @@ FileListBannerController.prototype.checkSpaceAndMaybeShowWelcomeBanner_ =
     group.add(function(onCompleted) {
       // Current directory must be set, since this code is called after
       // scanning is completed. However, the volumeInfo may be gone.
-      chrome.fileBrowserPrivate.getSizeStats(
+      chrome.fileManagerPrivate.getSizeStats(
           driveVolume.volumeId,
           function(result) {
             if (result && result.totalSize >= offerSize * 1024 * 1024 * 1024)
@@ -435,10 +435,10 @@ FileListBannerController.prototype.onDirectoryChanged_ = function(event) {
   if (isLowSpaceWarningTarget !==
       this.isLowSpaceWarningTarget_(previousRootVolume)) {
     if (isLowSpaceWarningTarget) {
-      chrome.fileBrowserPrivate.onDirectoryChanged.addListener(
+      chrome.fileManagerPrivate.onDirectoryChanged.addListener(
           this.privateOnDirectoryChangedBound_);
     } else {
-      chrome.fileBrowserPrivate.onDirectoryChanged.removeListener(
+      chrome.fileManagerPrivate.onDirectoryChanged.removeListener(
           this.privateOnDirectoryChangedBound_);
     }
   }
@@ -471,7 +471,7 @@ FileListBannerController.prototype.isLowSpaceWarningTarget_ =
 
 /**
  * Callback which is invoked when the file system has been changed.
- * @param {Object} event chrome.fileBrowserPrivate.onDirectoryChanged event.
+ * @param {Object} event chrome.fileManagerPrivate.onDirectoryChanged event.
  * @private
  */
 FileListBannerController.prototype.privateOnDirectoryChanged_ = function(
@@ -520,7 +520,7 @@ FileListBannerController.prototype.maybeShowLowSpaceWarning_ = function(
   if (!volume.fileSystem)
     return;
 
-  chrome.fileBrowserPrivate.getSizeStats(
+  chrome.fileManagerPrivate.getSizeStats(
       volume.volumeId,
       function(sizeStats) {
         var currentVolume = this.volumeManager_.getVolumeInfo(
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager.js b/ui/file_manager/file_manager/foreground/js/file_manager.js
index 3f4ff1f..5232654 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager.js
@@ -305,7 +305,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
 
     var stateChangeHandler =
         this.onPreferencesChanged_.bind(this);
-    chrome.fileBrowserPrivate.onPreferencesChanged.addListener(
+    chrome.fileManagerPrivate.onPreferencesChanged.addListener(
         stateChangeHandler);
     stateChangeHandler();
 
@@ -1774,7 +1774,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
     var selection = this.getSelection();
     // TODO(mtomasz): Move conversion from entry to url to custom bindings.
     // crbug.com/345527.
-    chrome.fileBrowserPrivate.setDefaultTask(
+    chrome.fileManagerPrivate.setDefaultTask(
         task.taskId,
         util.entriesToURLs(selection.entries),
         selection.mimeTypes);
@@ -2188,7 +2188,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       volumeSpaceInnerBar.style.width = '100%';
     }
 
-    chrome.fileBrowserPrivate.getSizeStats(
+    chrome.fileManagerPrivate.getSizeStats(
         currentVolumeInfo.volumeId, function(result) {
           var volumeInfo = this.volumeManager_.getVolumeInfo(
               this.directoryModel_.getCurrentDirEntry());
@@ -2948,7 +2948,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
    * @private
    */
   FileManager.prototype.onCancel_ = function(event) {
-    chrome.fileBrowserPrivate.cancelDialog();
+    chrome.fileManagerPrivate.cancelDialog();
     window.close();
   };
 
@@ -2964,7 +2964,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
    */
   FileManager.prototype.resolveSelectResults_ = function(fileUrls, callback) {
     if (this.isOnDrive()) {
-      chrome.fileBrowserPrivate.getDriveFiles(
+      chrome.fileManagerPrivate.getDriveFiles(
         fileUrls,
         function(localPaths) {
           callback(fileUrls);
@@ -2986,11 +2986,11 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       window.close();
     }
     if (selection.multiple) {
-      chrome.fileBrowserPrivate.selectFiles(
+      chrome.fileManagerPrivate.selectFiles(
           selection.urls, this.params_.shouldReturnLocalPath, callback);
     } else {
       var forOpening = (this.dialogType != DialogType.SELECT_SAVEAS_FILE);
-      chrome.fileBrowserPrivate.selectFile(
+      chrome.fileManagerPrivate.selectFile(
           selection.urls[0], selection.filterIndex, forOpening,
           this.params_.shouldReturnLocalPath, callback);
     }
@@ -3053,7 +3053,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       footer.setAttribute('progress', 'progress');
       this.cancelButton_.removeEventListener('click', this.onCancelBound_);
       this.cancelButton_.addEventListener('click', onCancel);
-      chrome.fileBrowserPrivate.onFileTransfersUpdated.addListener(
+      chrome.fileManagerPrivate.onFileTransfersUpdated.addListener(
           onFileTransfersUpdated);
     }.bind(this);
 
@@ -3062,7 +3062,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       footer.removeAttribute('progress');
       this.cancelButton_.removeEventListener('click', onCancel);
       this.cancelButton_.addEventListener('click', this.onCancelBound_);
-      chrome.fileBrowserPrivate.onFileTransfersUpdated.removeListener(
+      chrome.fileManagerPrivate.onFileTransfersUpdated.removeListener(
           onFileTransfersUpdated);
     }.bind(this);
 
@@ -3070,7 +3070,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       cancelled = true;
       // According to API cancel may fail, but there is no proper UI to reflect
       // this. So, we just silently assume that everything is cancelled.
-      chrome.fileBrowserPrivate.cancelFileTransfers(
+      chrome.fileManagerPrivate.cancelFileTransfers(
           selection.urls, function(response) {});
       cleanup();
     }.bind(this);
@@ -3268,7 +3268,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
     // If checked, the sync is disabled.
     var nowCellularDisabled = this.syncButton.hasAttribute('checked');
     var changeInfo = {cellularDisabled: !nowCellularDisabled};
-    chrome.fileBrowserPrivate.setPreferences(changeInfo);
+    chrome.fileManagerPrivate.setPreferences(changeInfo);
   };
 
   /**
@@ -3283,7 +3283,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
     */
     var changeInfo = {};
     changeInfo['hostedFilesDisabled'] = !nowHostedFilesDisabled;
-    chrome.fileBrowserPrivate.setPreferences(changeInfo);
+    chrome.fileManagerPrivate.setPreferences(changeInfo);
   };
 
   /**
@@ -3428,7 +3428,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       'types': 'ALL',
       'maxResults': 4
     };
-    chrome.fileBrowserPrivate.searchDriveMetadata(
+    chrome.fileManagerPrivate.searchDriveMetadata(
       searchParams,
       function(suggestions) {
         this.autocompleteSuggestionsBusy_ = false;
@@ -3615,7 +3615,7 @@ var BOTTOM_MARGIN_FOR_PREVIEW_PANEL_PX = 52;
       return;
     }
 
-    chrome.fileBrowserPrivate.getPreferences(function(prefs) {
+    chrome.fileManagerPrivate.getPreferences(function(prefs) {
       this.preferences_ = prefs;
       callback(prefs);
     }.bind(this));
diff --git a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
index 31bc19f..94fe053 100644
--- a/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
+++ b/ui/file_manager/file_manager/foreground/js/file_manager_commands.js
@@ -394,7 +394,7 @@ CommandHandler.COMMANDS_['format'] = {
     if (volumeInfo) {
       fileManager.confirm.show(
           loadTimeData.getString('FORMATTING_WARNING'),
-          chrome.fileBrowserPrivate.formatVolume.bind(null,
+          chrome.fileManagerPrivate.formatVolume.bind(null,
                                                       volumeInfo.volumeId));
     }
   },
@@ -442,7 +442,7 @@ CommandHandler.COMMANDS_['new-folder'] = {
  */
 CommandHandler.COMMANDS_['new-window'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.getProfiles(function(profiles,
+    chrome.fileManagerPrivate.getProfiles(function(profiles,
                                                    currentId,
                                                    displayedId) {
       fileManager.backgroundPage.launchFileManager({
@@ -700,7 +700,7 @@ CommandHandler.COMMANDS_['toggle-pinned'] = {
         if (entries.length == 0)
           return;
         currentEntry = entries.shift();
-        chrome.fileBrowserPrivate.pinDriveFile(
+        chrome.fileManagerPrivate.pinDriveFile(
             currentEntry.toURL(),
             pin,
             steps.entryPinned);
@@ -871,7 +871,7 @@ CommandHandler.COMMANDS_['remove-folder-shortcut'] = {
  */
 CommandHandler.COMMANDS_['zoom-in'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.zoom('in');
+    chrome.fileManagerPrivate.zoom('in');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -882,7 +882,7 @@ CommandHandler.COMMANDS_['zoom-in'] = {
  */
 CommandHandler.COMMANDS_['zoom-out'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.zoom('out');
+    chrome.fileManagerPrivate.zoom('out');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -893,7 +893,7 @@ CommandHandler.COMMANDS_['zoom-out'] = {
  */
 CommandHandler.COMMANDS_['zoom-reset'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.zoom('reset');
+    chrome.fileManagerPrivate.zoom('reset');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -904,7 +904,7 @@ CommandHandler.COMMANDS_['zoom-reset'] = {
  */
 CommandHandler.COMMANDS_['inspect-normal'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.openInspector('normal');
+    chrome.fileManagerPrivate.openInspector('normal');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -915,7 +915,7 @@ CommandHandler.COMMANDS_['inspect-normal'] = {
  */
 CommandHandler.COMMANDS_['inspect-console'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.openInspector('console');
+    chrome.fileManagerPrivate.openInspector('console');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -926,7 +926,7 @@ CommandHandler.COMMANDS_['inspect-console'] = {
  */
 CommandHandler.COMMANDS_['inspect-element'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.openInspector('element');
+    chrome.fileManagerPrivate.openInspector('element');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
@@ -937,7 +937,7 @@ CommandHandler.COMMANDS_['inspect-element'] = {
  */
 CommandHandler.COMMANDS_['inspect-background'] = {
   execute: function(event, fileManager) {
-    chrome.fileBrowserPrivate.openInspector('background');
+    chrome.fileManagerPrivate.openInspector('background');
   },
   canExecute: CommandUtil.canExecuteAlways
 };
diff --git a/ui/file_manager/file_manager/foreground/js/file_tasks.js b/ui/file_manager/file_manager/foreground/js/file_tasks.js
index 2d61d4f..647d62e 100644
--- a/ui/file_manager/file_manager/foreground/js/file_tasks.js
+++ b/ui/file_manager/file_manager/foreground/js/file_tasks.js
@@ -93,7 +93,7 @@ FileTasks.prototype.init = function(entries, opt_mimeTypes) {
   // crbug.com/345527.
   var urls = util.entriesToURLs(entries);
   if (urls.length > 0)
-    chrome.fileBrowserPrivate.getFileTasks(urls, this.onTasks_.bind(this));
+    chrome.fileManagerPrivate.getFileTasks(urls, this.onTasks_.bind(this));
 };
 
 /**
@@ -402,7 +402,7 @@ FileTasks.prototype.executeDefaultInternal_ = function(entries, opt_callback) {
     // crbug.com/345527.
     var urls = util.entriesToURLs(entries);
     var taskId = chrome.runtime.id + '|file|view-in-browser';
-    chrome.fileBrowserPrivate.executeTask(taskId, urls, onViewFiles);
+    chrome.fileManagerPrivate.executeTask(taskId, urls, onViewFiles);
   }.bind(this));
 };
 
@@ -436,7 +436,7 @@ FileTasks.prototype.executeInternal_ = function(taskId, entries) {
       // TODO(mtomasz): Move conversion from entry to url to custom bindings.
       // crbug.com/345527.
       var urls = util.entriesToURLs(entries);
-      chrome.fileBrowserPrivate.executeTask(taskId, urls, function(result) {
+      chrome.fileManagerPrivate.executeTask(taskId, urls, function(result) {
         if (result !== 'message_sent')
           return;
         util.isTeleported(window).then(function(teleported) {
@@ -546,7 +546,7 @@ FileTasks.prototype.executeInternalTask_ = function(id, entries) {
     // crbug.com/345527.
     var urls = util.entriesToURLs(entries);
     var position = urls.indexOf(selectedEntry.toURL());
-    chrome.fileBrowserPrivate.getProfiles(function(profiles,
+    chrome.fileManagerPrivate.getProfiles(function(profiles,
                                                    currentId,
                                                    displayedId) {
       fm.backgroundPage.launchAudioPlayer({items: urls, position: position},
diff --git a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js
index e641ee4..13edd5f6 100644
--- a/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js
+++ b/ui/file_manager/file_manager/foreground/js/file_transfer_controller.js
@@ -265,7 +265,7 @@ FileTransferController.prototype = {
         // TODO(mtomasz): Move conversion from entry to url to custom bindings.
         // crbug.com/345527.
         var urls = util.entriesToURLs(entries);
-        chrome.fileBrowserPrivate.getEntryProperties(urls, callback);
+        chrome.fileManagerPrivate.getEntryProperties(urls, callback);
       }).
       then(function(metadatas) {
         return entries.filter(function(entry, i) {
@@ -354,7 +354,7 @@ FileTransferController.prototype = {
               if (index >= shareEntries.length)
                 return;
               return new Promise(function(fulfill) {
-                chrome.fileBrowserPrivate.requestDriveShare(
+                chrome.fileManagerPrivate.requestDriveShare(
                     shareEntries[index].toURL(),
                     dialogResult,
                     function() {
diff --git a/ui/file_manager/file_manager/foreground/js/file_watcher.js b/ui/file_manager/file_manager/foreground/js/file_watcher.js
index 67ce04c..12da443 100644
--- a/ui/file_manager/file_manager/foreground/js/file_watcher.js
+++ b/ui/file_manager/file_manager/foreground/js/file_watcher.js
@@ -18,7 +18,7 @@ function FileWatcher(metadataCache) {
   this.watchedDirectoryEntry_ = null;
 
   this.onDirectoryChangedBound_ = this.onDirectoryChanged_.bind(this);
-  chrome.fileBrowserPrivate.onDirectoryChanged.addListener(
+  chrome.fileManagerPrivate.onDirectoryChanged.addListener(
       this.onDirectoryChangedBound_);
 
   this.filesystemMetadataObserverId_ = null;
@@ -35,7 +35,7 @@ FileWatcher.prototype.__proto__ = cr.EventTarget.prototype;
  * Stops watching (must be called before page unload).
  */
 FileWatcher.prototype.dispose = function() {
-  chrome.fileBrowserPrivate.onDirectoryChanged.removeListener(
+  chrome.fileManagerPrivate.onDirectoryChanged.removeListener(
       this.onDirectoryChangedBound_);
   if (this.watchedDirectoryEntry_)
     this.resetWatchedEntry_(function() {}, function() {});
@@ -153,7 +153,7 @@ FileWatcher.prototype.resetWatchedEntry_ = function(onSuccess, onError) {
   this.queue_.run(function(callback) {
     // Release the watched directory.
     if (this.watchedDirectoryEntry_) {
-      chrome.fileBrowserPrivate.removeFileWatch(
+      chrome.fileManagerPrivate.removeFileWatch(
           this.watchedDirectoryEntry_.toURL(),
           function(result) {
             this.watchedDirectoryEntry_ = null;
@@ -186,7 +186,7 @@ FileWatcher.prototype.changeWatchedEntry_ = function(
   var setEntryClosure = function() {
     // Run the tasks in the queue to avoid races.
     this.queue_.run(function(callback) {
-      chrome.fileBrowserPrivate.addFileWatch(
+      chrome.fileManagerPrivate.addFileWatch(
           entry.toURL(),
           function(result) {
             if (!result) {
diff --git a/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js b/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
index 66ad6f9..1293881 100644
--- a/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
+++ b/ui/file_manager/file_manager/foreground/js/metadata/metadata_cache.js
@@ -842,7 +842,7 @@ ExternalProvider.prototype.callApi_ = function() {
   // TODO(mtomasz): Move conversion from entry to url to custom bindings.
   // crbug.com/345527.
   var entryURLs = util.entriesToURLs(entries);
-  chrome.fileBrowserPrivate.getEntryProperties(
+  chrome.fileManagerPrivate.getEntryProperties(
       entryURLs,
       function(propertiesList) {
         console.assert(propertiesList.length === callbacks.length);
diff --git a/ui/file_manager/file_manager/foreground/js/metrics.js b/ui/file_manager/file_manager/foreground/js/metrics.js
index 3f34e51..7760483 100644
--- a/ui/file_manager/file_manager/foreground/js/metrics.js
+++ b/ui/file_manager/file_manager/foreground/js/metrics.js
@@ -40,7 +40,7 @@ metrics.convertName_ = function(name) {
 };
 
 /**
- * Wrapper method for calling chrome.fileBrowserPrivate safely.
+ * Wrapper method for calling chrome.fileManagerPrivate safely.
  * @param {string} name Method name.
  * @param {Array.<Object>} args Arguments.
  * @private
diff --git a/ui/file_manager/file_manager/foreground/js/share_dialog.js b/ui/file_manager/file_manager/foreground/js/share_dialog.js
index bde1e08..c95a51a 100644
--- a/ui/file_manager/file_manager/foreground/js/share_dialog.js
+++ b/ui/file_manager/file_manager/foreground/js/share_dialog.js
@@ -87,7 +87,7 @@ ShareDialog.WebViewAuthorizer.prototype.initialize = function(callback) {
  */
 ShareDialog.WebViewAuthorizer.prototype.authorize = function(callback) {
   // Fetch or update the access token.
-  chrome.fileBrowserPrivate.requestAccessToken(false,  // force_refresh
+  chrome.fileManagerPrivate.requestAccessToken(false,  // force_refresh
       function(inAccessToken) {
         this.accessToken_ = inAccessToken;
         callback();
@@ -265,7 +265,7 @@ ShareDialog.prototype.show = function(entry, callback) {
   // Fetches an url to the sharing dialog.
   var shareUrl;
   group.add(function(inCallback) {
-    chrome.fileBrowserPrivate.getShareUrl(
+    chrome.fileManagerPrivate.getShareUrl(
         entry.toURL(),
         function(inShareUrl) {
           if (!chrome.runtime.lastError)
diff --git a/ui/file_manager/file_manager/foreground/js/suggest_apps_dialog.js b/ui/file_manager/file_manager/foreground/js/suggest_apps_dialog.js
index 1195bc8..f5a46e7 100644
--- a/ui/file_manager/file_manager/foreground/js/suggest_apps_dialog.js
+++ b/ui/file_manager/file_manager/foreground/js/suggest_apps_dialog.js
@@ -167,7 +167,7 @@ SuggestAppsDialog.prototype.retrieveAuthorizeToken_ = function(callback) {
   }
 
   // Fetch or update the access token.
-  chrome.fileBrowserPrivate.requestWebStoreAccessToken(
+  chrome.fileManagerPrivate.requestWebStoreAccessToken(
       function(accessToken) {
         // In case of error, this.accessToken_ will be set to null.
         this.accessToken_ = accessToken;
diff --git a/ui/file_manager/file_manager/foreground/js/ui/multi_profile_share_dialog.js b/ui/file_manager/file_manager/foreground/js/ui/multi_profile_share_dialog.js
index 73e3843..5145e51 100644
--- a/ui/file_manager/file_manager/foreground/js/ui/multi_profile_share_dialog.js
+++ b/ui/file_manager/file_manager/foreground/js/ui/multi_profile_share_dialog.js
@@ -44,7 +44,7 @@ function MultiProfileShareDialog(parentNode) {
   this.frame_.id = 'multi-profile-share-dialog';
 
   this.currentProfileId_ = new Promise(function(callback) {
-    chrome.fileBrowserPrivate.getProfiles(
+    chrome.fileManagerPrivate.getProfiles(
         function(profiles, currentId, displayedId) {
       callback(currentId);
     });
diff --git a/ui/file_manager/file_manager/foreground/js/ui/search_box.js b/ui/file_manager/file_manager/foreground/js/ui/search_box.js
index 5f5e2f5..6eabb09 100644
--- a/ui/file_manager/file_manager/foreground/js/ui/search_box.js
+++ b/ui/file_manager/file_manager/foreground/js/ui/search_box.js
@@ -121,7 +121,7 @@ SearchBox.AutocompleteListItem_ = function(document, item) {
     var iconType = FileType.getIcon(item.entry);
     icon.setAttribute('file-type-icon', iconType);
     // highlightedBaseName is a piece of HTML with meta characters properly
-    // escaped. See the comment at fileBrowserPrivate.searchDriveMetadata().
+    // escaped. See the comment at fileManagerPrivate.searchDriveMetadata().
     text.innerHTML = item.highlightedBaseName;
   }
   li.appendChild(icon);
diff --git a/ui/file_manager/file_manager/manifest.json b/ui/file_manager/file_manager/manifest.json
index 9eed6a1..ca62945 100644
--- a/ui/file_manager/file_manager/manifest.json
+++ b/ui/file_manager/file_manager/manifest.json
@@ -26,7 +26,7 @@
     "contextMenus",
     "echoPrivate",
     "fileBrowserHandler",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fullscreen",
     "https://*.googleusercontent.com/",
     "https://docs.google.com/",
diff --git a/ui/file_manager/gallery/js/background.js b/ui/file_manager/gallery/js/background.js
index e76a91b..7413361 100644
--- a/ui/file_manager/gallery/js/background.js
+++ b/ui/file_manager/gallery/js/background.js
@@ -30,7 +30,7 @@ function BackgroundComponents(stringData, volumeManager) {
  */
 BackgroundComponents.load = function() {
   var stringDataPromise = new Promise(function(fulfill) {
-    chrome.fileBrowserPrivate.getStrings(function(stringData) {
+    chrome.fileManagerPrivate.getStrings(function(stringData) {
       loadTimeData.data = stringData;
       fulfill(stringData);
     });
@@ -62,7 +62,7 @@ var backgroundComponentsPromise = BackgroundComponents.load();
  */
 function resolveEntries(entries) {
   return new Promise(function(fulfill, reject) {
-    chrome.fileBrowserPrivate.resolveIsolatedEntries(entries,
+    chrome.fileManagerPrivate.resolveIsolatedEntries(entries,
                                                      function(externalEntries) {
       if (!chrome.runtime.lastError)
         fulfill(externalEntries);
diff --git a/ui/file_manager/gallery/js/gallery.js b/ui/file_manager/gallery/js/gallery.js
index 00c9d49..ca57fdea 100644
--- a/ui/file_manager/gallery/js/gallery.js
+++ b/ui/file_manager/gallery/js/gallery.js
@@ -597,10 +597,10 @@ Gallery.prototype.executeWhenReady = function(callback) {
 };
 
 /**
- * @return {Object} File browser private API.
+ * @return {Object} File manager private API.
  */
-Gallery.getFileBrowserPrivate = function() {
-  return chrome.fileBrowserPrivate || window.top.chrome.fileBrowserPrivate;
+Gallery.getFileManagerPrivate = function() {
+  return chrome.fileManagerPrivate || window.top.chrome.fileManagerPrivate;
 };
 
 /**
diff --git a/ui/file_manager/gallery/manifest.json b/ui/file_manager/gallery/manifest.json
index 4d88302..b2ac4fd3 100644
--- a/ui/file_manager/gallery/manifest.json
+++ b/ui/file_manager/gallery/manifest.json
@@ -22,7 +22,7 @@
     "chrome://resources/",
     "chrome://theme/",
     "fileBrowserHandler",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fileSystem",
     "fullscreen",
     "metricsPrivate",
diff --git a/ui/file_manager/image_loader/image_loader.js b/ui/file_manager/image_loader/image_loader.js
index 3f31c70..a9019da 100644
--- a/ui/file_manager/image_loader/image_loader.js
+++ b/ui/file_manager/image_loader/image_loader.js
@@ -25,10 +25,10 @@ function ImageLoader() {
 
   // Grant permissions to all volumes, initialize the cache and then start the
   // worker.
-  chrome.fileBrowserPrivate.getVolumeMetadataList(function(volumeMetadataList) {
+  chrome.fileManagerPrivate.getVolumeMetadataList(function(volumeMetadataList) {
     var initPromises = volumeMetadataList.map(function(volumeMetadata) {
       var requestPromise = new Promise(function(callback) {
-        chrome.fileBrowserPrivate.requestFileSystem(
+        chrome.fileManagerPrivate.requestFileSystem(
             volumeMetadata.volumeId,
             callback);
       });
@@ -40,10 +40,10 @@ function ImageLoader() {
     Promise.all(initPromises).then(this.worker_.start.bind(this.worker_));
 
     // Listen for mount events, and grant permissions to volumes being mounted.
-    chrome.fileBrowserPrivate.onMountCompleted.addListener(
+    chrome.fileManagerPrivate.onMountCompleted.addListener(
         function(event) {
           if (event.eventType == 'mount' && event.status == 'success') {
-            chrome.fileBrowserPrivate.requestFileSystem(
+            chrome.fileManagerPrivate.requestFileSystem(
                 event.volumeMetadata.volumeId, function() {});
           }
         });
diff --git a/ui/file_manager/image_loader/manifest.json b/ui/file_manager/image_loader/manifest.json
index ba4e820..1a24b9e 100644
--- a/ui/file_manager/image_loader/manifest.json
+++ b/ui/file_manager/image_loader/manifest.json
@@ -8,7 +8,7 @@
   "manifest_version": 2,
   "permissions": [
     "fileBrowserHandler",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "https://www.googledrive.com/"
   ],
   "content_security_policy": "default-src 'none'; script-src 'self'; style-src 'self'; frame-src 'self'; img-src 'self' data:; media-src 'self'; connect-src 'self' https://www.googledrive.com",
diff --git a/ui/file_manager/image_loader/request.js b/ui/file_manager/image_loader/request.js
index f0d9f13..dc17c7e 100644
--- a/ui/file_manager/image_loader/request.js
+++ b/ui/file_manager/image_loader/request.js
@@ -253,7 +253,7 @@ AuthorizedXHR.prototype.load = function(url, onSuccess, onFailure) {
   // Fetches the access token and makes an authorized call. If refresh is true,
   // then forces refreshing the access token.
   var requestTokenAndCall = function(refresh, onInnerSuccess, onInnerFailure) {
-    chrome.fileBrowserPrivate.requestAccessToken(refresh, function(token) {
+    chrome.fileManagerPrivate.requestAccessToken(refresh, function(token) {
       if (this.aborted_)
         return;
       if (!token) {
diff --git a/ui/file_manager/video_player/js/background.js b/ui/file_manager/video_player/js/background.js
index acbf1c4..6c350ae 100644
--- a/ui/file_manager/video_player/js/background.js
+++ b/ui/file_manager/video_player/js/background.js
@@ -13,7 +13,7 @@ var initializeQueue = new AsyncUtil.Queue();
 
 // Initializes the strings. This needs for the volume manager.
 initializeQueue.run(function(fulfill) {
-  chrome.fileBrowserPrivate.getStrings(function(stringData) {
+  chrome.fileManagerPrivate.getStrings(function(stringData) {
     loadTimeData.data = stringData;
     fulfill();
   }.wrap());
@@ -41,7 +41,7 @@ function onLaunched(launchData) {
       return item.entry;
     });
 
-    chrome.fileBrowserPrivate.resolveIsolatedEntries(isolatedEntries,
+    chrome.fileManagerPrivate.resolveIsolatedEntries(isolatedEntries,
         function(externalEntries) {
           videos = externalEntries.map(function(entry) {
             return Object.freeze({
diff --git a/ui/file_manager/video_player/js/cast/caster.js b/ui/file_manager/video_player/js/cast/caster.js
index a626a69..9cda445 100644
--- a/ui/file_manager/video_player/js/cast/caster.js
+++ b/ui/file_manager/video_player/js/cast/caster.js
@@ -60,7 +60,7 @@ function loadCastAPI(callback, opt_secondTry) {
     }
 
     // Installs the Google Cast API extension and retry loading.
-    chrome.fileBrowserPrivate.installWebstoreItem(
+    chrome.fileManagerPrivate.installWebstoreItem(
         'mafeflapfdfljijmlienjedomfjfmhpd',
         true,  // Don't use installation prompt.
         function() {
diff --git a/ui/file_manager/video_player/js/cast/media_manager.js b/ui/file_manager/video_player/js/cast/media_manager.js
index 16a118f..dbf8b8d 100644
--- a/ui/file_manager/video_player/js/cast/media_manager.js
+++ b/ui/file_manager/video_player/js/cast/media_manager.js
@@ -49,7 +49,7 @@ MediaManager.prototype.getToken = function(refresh) {
 
   return new Promise(function(fulfill, reject) {
     // TODO(yoshiki): Creates the method to get a token and use it.
-    chrome.fileBrowserPrivate.getDownloadUrl(this.entry_.toURL(), fulfill);
+    chrome.fileManagerPrivate.getDownloadUrl(this.entry_.toURL(), fulfill);
   }.bind(this)).then(function(url) {
     if (chrome.runtime.lastError) {
       return Promise.reject(
@@ -78,7 +78,7 @@ MediaManager.prototype.getUrl = function() {
 
   return new Promise(function(fulfill, reject) {
     // TODO(yoshiki): Creates the method to get a url and use it.
-    chrome.fileBrowserPrivate.getDownloadUrl(this.entry_.toURL(), fulfill);
+    chrome.fileManagerPrivate.getDownloadUrl(this.entry_.toURL(), fulfill);
   }.bind(this)).then(function(url) {
     if (chrome.runtime.lastError) {
       return Promise.reject(
@@ -105,7 +105,7 @@ MediaManager.prototype.getMime = function() {
     return Promise.resolve(this.cachedDriveProp_.contentMimeType || '');
 
   return new Promise(function(fulfill, reject) {
-    chrome.fileBrowserPrivate.getEntryProperties(
+    chrome.fileManagerPrivate.getEntryProperties(
         [this.entry_.toURL()], fulfill);
   }.bind(this)).then(function(props) {
     if (!props || !props[0]) {
@@ -131,7 +131,7 @@ MediaManager.prototype.getThumbnail = function() {
     return Promise.resolve(this.cachedDriveProp_.thumbnailUrl || '');
 
   return new Promise(function(fulfill, reject) {
-    chrome.fileBrowserPrivate.getEntryProperties(
+    chrome.fileManagerPrivate.getEntryProperties(
         [this.entry_.toURL()], fulfill);
   }.bind(this)).then(function(props) {
     if (!props || !props[0]) {
diff --git a/ui/file_manager/video_player/js/video_player.js b/ui/file_manager/video_player/js/video_player.js
index b4a2bde..dba0d6a 100644
--- a/ui/file_manager/video_player/js/video_player.js
+++ b/ui/file_manager/video_player/js/video_player.js
@@ -659,7 +659,7 @@ var player = new VideoPlayer();
  * @param {function()} callback Called when the sting data is ready.
  */
 function initStrings(callback) {
-  chrome.fileBrowserPrivate.getStrings(function(strings) {
+  chrome.fileManagerPrivate.getStrings(function(strings) {
     loadTimeData.data = strings;
     callback();
   }.wrap(null));
diff --git a/ui/file_manager/video_player/manifest.json b/ui/file_manager/video_player/manifest.json
index b45368c4..75dff8e 100644
--- a/ui/file_manager/video_player/manifest.json
+++ b/ui/file_manager/video_player/manifest.json
@@ -20,7 +20,7 @@
     "commandLinePrivate",
     "fileSystem",
     "fileBrowserHandler",
-    "fileBrowserPrivate",
+    "fileManagerPrivate",
     "fullscreen",
     "mediaPlayerPrivate",
     "power",