file_manager: Use 'file_manager' namespace more consistently

'file_manager' namespace should be used consistently in
chrome/browser/chromeos/extensions/file_manager

BUG=267375
TEST=none

Review URL: https://chromiumcodereview.appspot.com/21764002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215421 0039d316-1c4b-4281-b951-d872f2087c98

37 files changed, 118 insertions, 65 deletions

diff --git a/chrome/browser/chromeos/drive/file_task_executor.cc b/chrome/browser/chromeos/drive/file_task_executor.cc
index a42f71c..9450624 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.cc
+++ b/chrome/browser/chromeos/drive/file_task_executor.cc
@@ -36,7 +36,7 @@ FileTaskExecutor::~FileTaskExecutor() {
 
 void FileTaskExecutor::Execute(
     const std::vector<FileSystemURL>& file_urls,
-    const file_handler_util::FileTaskFinishedCallback& done) {
+    const file_manager::file_handler_util::FileTaskFinishedCallback& done) {
   std::vector<base::FilePath> paths;
   for (size_t i = 0; i < file_urls.size(); ++i) {
     base::FilePath path = util::ExtractDrivePathFromFileSystemUrl(file_urls[i]);
diff --git a/chrome/browser/chromeos/drive/file_task_executor.h b/chrome/browser/chromeos/drive/file_task_executor.h
index 35b5440..cfcb7da 100644
--- a/chrome/browser/chromeos/drive/file_task_executor.h
+++ b/chrome/browser/chromeos/drive/file_task_executor.h
@@ -27,8 +27,9 @@ class FileTaskExecutor {
   FileTaskExecutor(Profile* profile, const std::string& app_id);
 
   // Executes file tasks, runs |done| and deletes |this|.
-  void Execute(const std::vector<fileapi::FileSystemURL>& file_urls,
-               const file_handler_util::FileTaskFinishedCallback& done);
+  void Execute(
+      const std::vector<fileapi::FileSystemURL>& file_urls,
+      const file_manager::file_handler_util::FileTaskFinishedCallback& done);
 
  private:
   ~FileTaskExecutor();
@@ -44,7 +45,7 @@ class FileTaskExecutor {
   Profile* profile_;
   std::string app_id_;
   int current_index_;
-  file_handler_util::FileTaskFinishedCallback done_;
+  file_manager::file_handler_util::FileTaskFinishedCallback done_;
 
   base::WeakPtrFactory<FileTaskExecutor> weak_ptr_factory_;
 };
diff --git a/chrome/browser/chromeos/extensions/file_manager/drive_test_util.cc b/chrome/browser/chromeos/extensions/file_manager/drive_test_util.cc
index 4fe56ae..7a236e8 100644
--- a/chrome/browser/chromeos/extensions/file_manager/drive_test_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/drive_test_util.cc
@@ -11,7 +11,8 @@
 #include "content/public/browser/browser_context.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
-namespace drive_test_util {
+namespace file_manager {
+namespace test_util {
 
 namespace {
 
@@ -77,4 +78,5 @@ void WaitUntilDriveMountPointIsAdded(Profile* profile) {
   LOG(INFO) << "Drive mount point found.";
 }
 
-}  // namespace drive_test_util
+}  // namespace test_util
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/drive_test_util.h b/chrome/browser/chromeos/extensions/file_manager/drive_test_util.h
index dc0dd40..c420d77 100644
--- a/chrome/browser/chromeos/extensions/file_manager/drive_test_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager/drive_test_util.h
@@ -7,13 +7,15 @@
 
 class Profile;
 
-namespace drive_test_util {
+namespace file_manager {
+namespace test_util {
 
 // Waits until Drive mount point for |profile| is added. Drive mount point is
 // added by the browser but tests should use this function to ensure that the
 // Drive mount point is added before accessing Drive.
 void WaitUntilDriveMountPointIsAdded(Profile* profile);
 
-}  // namespace drive_test_util
+}  // namespace test_util
+}  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_DRIVE_TEST_UTIL_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
index 1f2a945..cd9aa00 100644
--- a/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/external_filesystem_apitest.cc
@@ -45,6 +45,7 @@
 
 using extensions::Extension;
 
+namespace file_manager {
 namespace {
 
 // Root dirs for file systems expected by the test extensions.
@@ -303,7 +304,7 @@ class DriveFileSystemExtensionApiTest : public FileSystemExtensionApiTestBase {
 
   // FileSystemExtensionApiTestBase OVERRIDE.
   virtual void AddTestMountPoint() OVERRIDE {
-    drive_test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
+    test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
   }
 
  protected:
@@ -431,3 +432,4 @@ IN_PROC_BROWSER_TEST_F(DriveFileSystemExtensionApiTest, AppFileHandler) {
 }
 
 }  // namespace
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
index 09b55ea..a88df72 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.cc
@@ -54,8 +54,8 @@
 using content::BrowserContext;
 using content::BrowserThread;
 using extensions::api::file_browser_handler_internal::FileEntryInfo;
-using file_handler::FileSelector;
-using file_handler::FileSelectorFactory;
+using file_manager::FileSelector;
+using file_manager::FileSelectorFactory;
 
 namespace SelectFile =
     extensions::api::file_browser_handler_internal::SelectFile;
@@ -103,7 +103,7 @@ class FileSelectorImpl : public FileSelector,
   virtual ~FileSelectorImpl() OVERRIDE;
 
  protected:
-  // file_handler::FileSelectr overrides.
+  // file_manager::FileSelectr overrides.
   // Shows save as dialog with suggested name in window bound to |browser|.
   // |allowed_extensions| specifies the file extensions allowed to be shown,
   // and selected. Extensions should not include '.'.
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h
index 9839f8f..e35780f 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api.h
@@ -21,7 +21,7 @@
 class Browser;
 class FileBrowserHandlerInternalSelectFileFunction;
 
-namespace file_handler {
+namespace file_manager {
 
 // Interface that is used by FileBrowserHandlerInternalSelectFileFunction to
 // select the file path that should be reported back to the extension function
@@ -66,8 +66,13 @@ class FileSelectorFactory {
   virtual FileSelector* CreateFileSelector() const = 0;
 };
 
-}  // namespace file_handler
+}  // namespace file_manager
 
+
+// Note that this class is not in 'file_manager' class to be consistent with
+// all other extension functions registered in
+// chrome/common/extensions/api/generated_api.cc being in the global namespace.
+//
 // The fileBrowserHandlerInternal.selectFile extension function implementation.
 // See the file description for more info.
 class FileBrowserHandlerInternalSelectFileFunction
@@ -83,7 +88,7 @@ class FileBrowserHandlerInternalSelectFileFunction
   // invoked by user gesture.
   // Created object will take the ownership of the |file_selector_factory|.
   FileBrowserHandlerInternalSelectFileFunction(
-      file_handler::FileSelectorFactory* file_selector_factory,
+      file_manager::FileSelectorFactory* file_selector_factory,
       bool enable_user_gesture_check);
 
   // Called by FileSelector implementation when the user selects the file's
@@ -136,7 +141,7 @@ class FileBrowserHandlerInternalSelectFileFunction
 
   // Factory used to create FileSelector to be used for prompting user to select
   // file.
-  scoped_ptr<file_handler::FileSelectorFactory> file_selector_factory_;
+  scoped_ptr<file_manager::FileSelectorFactory> file_selector_factory_;
   // Whether user gesture check is disabled. This should be true only in tests.
   bool user_gesture_check_enabled_;
 
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
index c63e08e..8608786 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc
@@ -67,7 +67,7 @@ void ExpectFileContentEquals(const base::FilePath& selected_path,
 // When |SelectFile| is called, it will check that file name suggestion is as
 // expected, and respond to the extension function with specified selection
 // results.
-class MockFileSelector : public file_handler::FileSelector {
+class MockFileSelector : public file_manager::FileSelector {
  public:
   MockFileSelector(const base::FilePath& suggested_name,
                    const std::vector<std::string>& allowed_extensions,
@@ -80,7 +80,7 @@ class MockFileSelector : public file_handler::FileSelector {
   }
   virtual ~MockFileSelector() {}
 
-  // file_handler::FileSelector implementation.
+  // file_manager::FileSelector implementation.
   // |browser| is not used.
   virtual void SelectFile(
       const base::FilePath& suggested_name,
@@ -124,7 +124,7 @@ class MockFileSelector : public file_handler::FileSelector {
 // Mocks file selector factory for the test.
 // When |CreateFileSelector| is invoked it will create mock file selector for
 // the extension function with test parameters from the object ctor.
-class MockFileSelectorFactory : public file_handler::FileSelectorFactory {
+class MockFileSelectorFactory : public file_manager::FileSelectorFactory {
  public:
   explicit MockFileSelectorFactory(const TestCase& test_case)
       : suggested_name_(test_case.suggested_name),
@@ -134,8 +134,8 @@ class MockFileSelectorFactory : public file_handler::FileSelectorFactory {
   }
   virtual ~MockFileSelectorFactory() {}
 
-  // file_handler::FileSelectorFactory implementation.
-  virtual file_handler::FileSelector* CreateFileSelector() const OVERRIDE {
+  // file_manager::FileSelectorFactory implementation.
+  virtual file_manager::FileSelector* CreateFileSelector() const OVERRIDE {
     return new MockFileSelector(suggested_name_,
                                 allowed_extensions_,
                                 success_,
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h
index ac4dd74d..60da290 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h
@@ -8,11 +8,12 @@
 #include "base/memory/scoped_ptr.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 
-class FileManagerEventRouter;
 class Profile;
 
 namespace file_manager {
 
+class FileManagerEventRouter;
+
 // Manages and registers the fileBrowserPrivate API with the extension system.
 class FileBrowserPrivateAPI : public BrowserContextKeyedService {
  public:
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
index ca94b06..167918e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.cc
@@ -49,6 +49,7 @@ using content::WebContents;
 using extensions::Extension;
 using fileapi::FileSystemURL;
 
+namespace file_manager {
 namespace file_handler_util {
 
 const char kTaskFile[] = "file";
@@ -810,4 +811,5 @@ void ExtensionTaskExecutor::SetupHandlerHostFileAccessPermissions(
   }
 }
 
-} // namespace file_handler_util
+}  // namespace file_handler_util
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.h b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.h
index 9cb5b67..3cd0d35 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_handler_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_handler_util.h
@@ -21,6 +21,8 @@ namespace fileapi {
 class FileSystemURL;
 }
 
+namespace file_manager {
+// TODO(satorux): Rename 'file_handler_util' to 'file_tasks'. crbug.com/267337
 namespace file_handler_util {
 
 // Tasks are stored as a vector in order of priorities.
@@ -106,5 +108,6 @@ bool ExecuteFileTask(Profile* profile,
                      const FileTaskFinishedCallback& done);
 
 }  // namespace file_handler_util
+}  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_HANDLER_UTIL_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
index 1b2e41d..246bcf2 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_browsertest.cc
@@ -36,6 +36,7 @@
 #include "content/public/test/test_utils.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 
+namespace file_manager {
 namespace {
 
 enum EntryType {
@@ -377,7 +378,7 @@ void FileManagerBrowserTest::SetUpOnMainThread() {
     for (size_t i = 0; i < arraysize(kTestEntrySetDriveOnly); ++i)
       drive_volume_->CreateEntry(kTestEntrySetDriveOnly[i]);
 
-    drive_test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
+    test_util::WaitUntilDriveMountPointIsAdded(browser()->profile());
   }
 }
 
@@ -507,4 +508,6 @@ INSTANTIATE_TEST_CASE_P(
                       TestParameter(NOT_IN_GUEST_MODE, "restoreSortColumn"),
                       TestParameter(IN_GUEST_MODE, "restoreCurrentView"),
                       TestParameter(NOT_IN_GUEST_MODE, "restoreCurrentView")));
+
 }  // namespace
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
index 487ea2d..8e93964 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.cc
@@ -40,6 +40,7 @@ using content::BrowserThread;
 using drive::DriveIntegrationService;
 using drive::DriveIntegrationServiceFactory;
 
+namespace file_manager {
 namespace {
 
 const char kPathChanged[] = "changed";
@@ -164,7 +165,7 @@ scoped_ptr<base::DictionaryValue> JobInfoToDictionaryValue(
   DCHECK(IsActiveFileTransferJobInfo(job_info));
 
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
-  GURL url = file_manager_util::ConvertRelativePathToFileSystemUrl(
+  GURL url = util::ConvertRelativePathToFileSystemUrl(
       job_info.file_path, extension_id);
   result->SetString("fileUrl", url.spec());
   result->SetString("transferState", job_status);
@@ -708,7 +709,7 @@ void FileManagerEventRouter::DispatchMountEvent(
       mount_info.mount_condition) {
     // Convert mount point path to relative path with the external file system
     // exposed within File API.
-    if (file_manager_util::ConvertFileToRelativeFileSystemPath(
+    if (util::ConvertFileToRelativeFileSystemPath(
             profile_,
             kFileBrowserDomain,
             base::FilePath(mount_info.mount_path),
@@ -746,8 +747,8 @@ void FileManagerEventRouter::ShowRemovableDeviceInFileManager(
       dcim_path,
       IsGooglePhotosInstalled(profile_) ?
         base::Bind(&base::DoNothing) :
-        base::Bind(&file_manager_util::ViewRemovableDrive, mount_path),
-      base::Bind(&file_manager_util::ViewRemovableDrive, mount_path));
+        base::Bind(&util::ViewRemovableDrive, mount_path),
+      base::Bind(&util::ViewRemovableDrive, mount_path));
 }
 
 void FileManagerEventRouter::OnDiskAdded(
@@ -870,3 +871,5 @@ void FileManagerEventRouter::OnFormatCompleted(
                                      device_path);
   }
 }
+
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
index 7fff315..ace1195 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_event_router.h
@@ -18,11 +18,14 @@
 #include "chrome/browser/drive/drive_service_interface.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
-class FileManagerNotifications;
-class MountedDiskMonitor;
 class PrefChangeRegistrar;
 class Profile;
 
+namespace file_manager {
+
+class FileManagerNotifications;
+class MountedDiskMonitor;
+
 // Monitors changes in disk mounts, network connection state and preferences
 // affecting File Manager. Dispatches appropriate File Browser events.
 class FileManagerEventRouter
@@ -166,4 +169,6 @@ class FileManagerEventRouter
   DISALLOW_COPY_AND_ASSIGN(FileManagerEventRouter);
 };
 
+}  // namespace file_manager
+
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_EVENT_ROUTER_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.cc
index 89cdd77..64236e4 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.cc
@@ -16,6 +16,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace file_manager {
 namespace {
 
 struct NotificationTypeInfo {
@@ -169,7 +170,7 @@ class FileManagerNotifications::NotificationMessage {
     // TODO(mukai): refactor here to invoke NotificationUIManager directly.
     const string16 replace_id = UTF8ToUTF16(notification_id);
     DesktopNotificationService::AddIconNotification(
-        file_manager_util::GetFileBrowserExtensionUrl(), GetTitle(type),
+        util::GetFileBrowserExtensionUrl(), GetTitle(type),
         message, icon, replace_id,
         new Delegate(host->AsWeakPtr(), notification_id), profile);
   }
@@ -383,3 +384,5 @@ string16 FileManagerNotifications::GetNotificationMessageForTest(
     return string16();
   return it->second->message();
 }
+
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
index 559e9cc..d41fec4 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications.h
@@ -16,6 +16,8 @@
 
 class Profile;
 
+namespace file_manager {
+
 class FileManagerNotifications
     : public base::SupportsWeakPtr<FileManagerNotifications> {
  public:
@@ -94,4 +96,6 @@ class FileManagerNotifications
   DISALLOW_COPY_AND_ASSIGN(FileManagerNotifications);
 };
 
+}  // namespace file_manager
+
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_NOTIFICATIONS_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_browsertest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_browsertest.cc
index a590aa1..64c0dbc 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_browsertest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_browsertest.cc
@@ -16,7 +16,7 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-namespace chromeos {
+namespace file_manager {
 
 class FileManagerNotificationsTest : public InProcessBrowserTest {
  public:
@@ -176,4 +176,4 @@ IN_PROC_BROWSER_TEST_F(FileManagerNotificationsTest, IdenticalNotificationIds) {
   notifications_->UnregisterDevice("path");
 }
 
-}  // namespace chromeos.
+}  // namespace file_manager.
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_unittest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_unittest.cc
index 7a22c3b..00316d3 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_unittest.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_notifications_unittest.cc
@@ -17,7 +17,7 @@ using ::testing::_;
 using ::testing::InSequence;
 using ::testing::StrEq;
 
-namespace chromeos {
+namespace file_manager {
 
 namespace {
 
@@ -241,4 +241,4 @@ TEST(FileManagerMountNotificationsTest, MulitpleFail) {
       device_label, false, false, false);
 }
 
-}  // namespace chromeos.
+}  // namespace file_manager.
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
index 0e36d48..b8278ce 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.cc
@@ -82,7 +82,8 @@ const char kFileBrowserPlayTaskId[] = "play";
 
 const char kVideoPlayerAppName[] = "videoplayer";
 
-namespace file_manager_util {
+namespace file_manager {
+namespace util {
 namespace {
 
 const char kCRXExtension[] = ".crx";
@@ -870,4 +871,5 @@ std::string GetMimeTypeForPath(const base::FilePath& file_path) {
   }
 }
 
-}  // namespace file_manager_util
+}  // namespace util
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.h
index e5549f8..dbf68d7 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_manager_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_util.h
@@ -19,7 +19,8 @@ extern const char kFileBrowserGalleryTaskId[];
 extern const char kFileBrowserWatchTaskId[];
 
 // File manager helper methods.
-namespace file_manager_util {
+namespace file_manager {
+namespace util {
 
 // Gets base file browser url.
 GURL GetFileBrowserExtensionUrl();
@@ -96,6 +97,7 @@ bool ShouldBeOpenedWithPlugin(Profile* profile, const char* file_extension);
 // Returns the MIME type of |file_path|.
 std::string GetMimeTypeForPath(const base::FilePath& file_path);
 
-}  // namespace file_manager_util
+}  // namespace util
+}  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_MANAGER_UTIL_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc b/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc
index 7dfd98e..706129e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.cc
@@ -11,6 +11,7 @@
 
 using content::BrowserThread;
 
+namespace file_manager {
 namespace {
 
 // Creates a base::FilePathWatcher and starts watching at |watch_path| with
@@ -115,3 +116,5 @@ void FileWatcherExtensions::OnWatcherStarted(
     callback.Run(false);
   }
 }
+
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.h b/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.h
index 69774af..9b0ee79 100644
--- a/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.h
+++ b/chrome/browser/chromeos/extensions/file_manager/file_watcher_extensions.h
@@ -13,6 +13,8 @@
 #include "base/files/file_path_watcher.h"
 #include "base/memory/weak_ptr.h"
 
+namespace file_manager {
+
 // This class is used to remember what extensions are watching |virtual_path|.
 class FileWatcherExtensions {
  public:
@@ -62,4 +64,6 @@ class FileWatcherExtensions {
   base::WeakPtrFactory<FileWatcherExtensions> weak_ptr_factory_;
 };
 
+}  // namespace file_manager
+
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_FILE_WATCHER_EXTENSIONS_H_
diff --git a/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc b/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc
index 46281795..d59ef49 100644
--- a/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.cc
@@ -12,6 +12,7 @@
 using chromeos::DBusThreadManager;
 using chromeos::disks::DiskMountManager;
 
+namespace file_manager {
 namespace {
 
 // Time span of the resuming process. All unmount events sent during this
@@ -112,3 +113,5 @@ void MountedDiskMonitor::Reset() {
   unmounted_while_resuming_.clear();
   is_resuming_ = false;
 }
+
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.h b/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.h
index 98d7658..d4c0730 100644
--- a/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.h
+++ b/chrome/browser/chromeos/extensions/file_manager/mounted_disk_monitor.h
@@ -14,6 +14,8 @@
 #include "chromeos/dbus/power_manager_client.h"
 #include "chromeos/disks/disk_mount_manager.h"
 
+namespace file_manager {
+
 // Observes PowerManager and updates its state when the system suspends and
 // resumes. After the system resumes it will stay in "is_resuming" state for
 // couple of seconds. This is to give DiskManager time to process device
@@ -68,4 +70,6 @@ class MountedDiskMonitor
   DISALLOW_COPY_AND_ASSIGN(MountedDiskMonitor);
 };
 
+}  // namespace file_manager
+
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_MOUNTED_DISK_MONITOR_H_
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 b6010c6..b42dda6 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc
@@ -742,7 +742,7 @@ bool GetShareUrlFunction::RunImpl() {
 
   integration_service->file_system()->GetShareUrl(
       drive_path,
-      file_manager_util::GetFileBrowserExtensionUrl(),  // embed origin
+      util::GetFileBrowserExtensionUrl(),  // embed origin
       base::Bind(&GetShareUrlFunction::OnGetShareUrl, this));
   return true;
 }
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 8a59d00..61bf6ac 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
@@ -72,7 +72,7 @@ base::DictionaryValue* CreateValueFromDisk(
   std::string mount_path;
   if (!volume->mount_path().empty()) {
     base::FilePath relative_mount_path;
-    file_manager_util::ConvertFileToRelativeFileSystemPath(
+    util::ConvertFileToRelativeFileSystemPath(
         profile, extension_id, base::FilePath(volume->mount_path()),
         &relative_mount_path);
     mount_path = relative_mount_path.value();
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 f28248d..115b18c 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -158,11 +158,10 @@ bool ZipSelectionFunction::RunImpl() {
     src_relative_paths.push_back(relative_path);
   }
 
-  zip_file_creator_ =
-      new extensions::ZipFileCreator(this,
-                                     src_dir,
-                                     src_relative_paths,
-                                     dest_file);
+  zip_file_creator_ = new ZipFileCreator(this,
+                                         src_dir,
+                                         src_relative_paths,
+                                         dest_file);
 
   // Keep the refcount until the zipping is complete on utility process.
   AddRef();
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 6e28589..922864d 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.h
@@ -61,7 +61,7 @@ class SetPreferencesFunction : public SyncExtensionFunction {
 // Implements the chrome.fileBrowserPrivate.zipSelection method.
 // Creates a zip file for the selected files.
 class ZipSelectionFunction : public LoggedAsyncExtensionFunction,
-                             public extensions::ZipFileCreator::Observer {
+                             public ZipFileCreator::Observer {
  public:
   DECLARE_EXTENSION_FUNCTION("fileBrowserPrivate.zipSelection",
                              FILEBROWSERPRIVATE_ZIPSELECTION)
@@ -78,7 +78,7 @@ class ZipSelectionFunction : public LoggedAsyncExtensionFunction,
   virtual void OnZipDone(bool success) OVERRIDE;
 
  private:
-  scoped_refptr<extensions::ZipFileCreator> zip_file_creator_;
+  scoped_refptr<ZipFileCreator> zip_file_creator_;
 };
 
 // Implements the chrome.fileBrowserPrivate.zoom method.
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 194def0..806be96 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_mount.cc
@@ -41,7 +41,7 @@ base::DictionaryValue* CreateValueFromMountPoint(
   base::FilePath relative_mount_path;
   // Convert mount point path to relative path with the external file system
   // exposed within File API.
-  if (file_manager_util::ConvertFileToRelativeFileSystemPath(
+  if (util::ConvertFileToRelativeFileSystemPath(
           profile,
           extension_id,
           base::FilePath(mount_point_info.mount_path),
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 6c094b3..6d6505e 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_strings.cc
@@ -501,9 +501,9 @@ bool GetStringsFunction::RunImpl() {
 #undef SET_STRING
 
   dict->SetBoolean("PDF_VIEW_ENABLED",
-      file_manager_util::ShouldBeOpenedWithPlugin(profile(), ".pdf"));
+                   util::ShouldBeOpenedWithPlugin(profile(), ".pdf"));
   dict->SetBoolean("SWF_VIEW_ENABLED",
-      file_manager_util::ShouldBeOpenedWithPlugin(profile(), ".swf"));
+                   util::ShouldBeOpenedWithPlugin(profile(), ".swf"));
 
   webui::SetFontAndTextDirection(dict);
 
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 0b79d1d..6910120 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_tasks.cc
@@ -87,7 +87,7 @@ void GetMimeTypesForFileURLs(const std::vector<base::FilePath>& file_paths,
   for (std::vector<base::FilePath>::const_iterator iter = file_paths.begin();
        iter != file_paths.end(); ++iter) {
     files->insert(
-        std::make_pair(*iter, file_manager_util::GetMimeTypeForPath(*iter)));
+        std::make_pair(*iter, util::GetMimeTypeForPath(*iter)));
   }
 }
 
@@ -641,7 +641,7 @@ bool ViewFilesFunction::RunImpl() {
 
   if (browser) {
     for (size_t i = 0; i < files.size(); ++i) {
-      bool handled = file_manager_util::ExecuteBuiltinHandler(
+      bool handled = util::ExecuteBuiltinHandler(
           browser, files[i], internal_task_id);
       if (!handled && files.size() == 1)
         success = false;
diff --git a/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.cc b/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.cc
index 8833a52..4f81270 100644
--- a/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.cc
@@ -23,7 +23,7 @@
 using content::BrowserThread;
 using content::UtilityProcessHost;
 
-namespace extensions {
+namespace file_manager {
 
 ZipFileCreator::ZipFileCreator(
     Observer* observer,
@@ -123,4 +123,4 @@ void ZipFileCreator::ReportDone(bool success) {
   observer_->OnZipDone(success);
 }
 
-}  // namespace extensions
+}  // namespace file_manager
diff --git a/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h b/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h
index bc9defb..122d5cc 100644
--- a/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h
+++ b/chrome/browser/chromeos/extensions/file_manager/zip_file_creator.h
@@ -14,7 +14,7 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/utility_process_host_client.h"
 
-namespace extensions {
+namespace file_manager {
 
 // ZipFileCreator creates a ZIP file from a specified list of files and
 // directories under a common parent directory. This is done in a sandboxed
@@ -88,6 +88,6 @@ class ZipFileCreator : public content::UtilityProcessHostClient {
   bool got_response_;
 };
 
-}  // namespace extensions
+}  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_ZIP_FILE_CREATOR_H_
diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc
index 5bbeefa..ce6f47a 100644
--- a/chrome/browser/chromeos/media/media_player.cc
+++ b/chrome/browser/chromeos/media/media_player.cc
@@ -151,7 +151,7 @@ void MediaPlayer::PopupMediaPlayer() {
 }
 
 GURL MediaPlayer::GetMediaPlayerUrl() {
-  return file_manager_util::GetMediaPlayerUrl();
+  return file_manager::util::GetMediaPlayerUrl();
 }
 
 Browser* MediaPlayer::GetBrowser() {
diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc
index ae27115..49df102 100644
--- a/chrome/browser/platform_util_chromeos.cc
+++ b/chrome/browser/platform_util_chromeos.cc
@@ -39,12 +39,12 @@ namespace platform_util {
 
 void ShowItemInFolder(const base::FilePath& full_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  file_manager_util::ShowFileInFolder(full_path);
+  file_manager::util::ShowFileInFolder(full_path);
 }
 
 void OpenItem(const base::FilePath& full_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  file_manager_util::ViewItem(full_path);
+  file_manager::util::ViewItem(full_path);
 }
 
 void OpenExternal(const GURL& url) {
diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc
index a73c4b5..548e93f 100644
--- a/chrome/browser/ui/ash/screenshot_taker.cc
+++ b/chrome/browser/ui/ash/screenshot_taker.cc
@@ -69,7 +69,7 @@ class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
     if (!success_)
       return;
 #if defined(OS_CHROMEOS)
-    file_manager_util::ShowFileInFolder(screenshot_path_);
+    file_manager::util::ShowFileInFolder(screenshot_path_);
 #else
     // TODO(sschmitz): perhaps add similar action for Windows.
 #endif
diff --git a/chrome/browser/ui/views/select_file_dialog_extension.cc b/chrome/browser/ui/views/select_file_dialog_extension.cc
index 7641c01..e098707 100644
--- a/chrome/browser/ui/views/select_file_dialog_extension.cc
+++ b/chrome/browser/ui/views/select_file_dialog_extension.cc
@@ -333,9 +333,9 @@ void SelectFileDialogExtension::SelectFileImpl(
   // (crbug.com/178013 #9-#11). In such a case, we use the last selected
   // directory as a workaround. Real fix is tracked at crbug.com/110119.
   if (default_dialog_path.IsAbsolute() &&
-      (file_manager_util::ConvertFileToRelativeFileSystemPath(
+      (file_manager::util::ConvertFileToRelativeFileSystemPath(
            profile_, kFileBrowserDomain, default_dialog_path, &virtual_path) ||
-       file_manager_util::ConvertFileToRelativeFileSystemPath(
+       file_manager::util::ConvertFileToRelativeFileSystemPath(
            profile_, kFileBrowserDomain, fallback_path, &virtual_path))) {
     virtual_path = base::FilePath("/").Append(virtual_path);
   } else {
@@ -346,7 +346,7 @@ void SelectFileDialogExtension::SelectFileImpl(
   has_multiple_file_type_choices_ =
       file_types ? file_types->extensions.size() > 1 : true;
 
-  GURL file_browser_url = file_manager_util::GetFileBrowserUrlWithParams(
+  GURL file_browser_url = file_manager::util::GetFileBrowserUrlWithParams(
       type, title, virtual_path, file_types, file_type_index,
       default_extension);
 
@@ -356,7 +356,7 @@ void SelectFileDialogExtension::SelectFileImpl(
       kFileManagerWidth,
       kFileManagerHeight,
 #if defined(USE_AURA)
-      file_manager_util::GetTitleFromType(type),
+      file_manager::util::GetTitleFromType(type),
 #else
       // HTML-based header used.
       string16(),