drive: Switch Drive mount path to per-profile one.

chrome/browser/chromeos/drive/drive_integration_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/drive/drive_integration_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/prefs/pref_change_registrar.h"
 #include "base/prefs/pref_service.h"
@@ skipping 335 matching lines @@
   }
 }
 
 bool DriveIntegrationService::IsMounted() const {
   if (mount_point_name_.empty())
     return false;
 
   // Look up the registered path, and just discard it.
   // GetRegisteredPath() returns true if the path is available.
   base::FilePath unused;
-  return BrowserContext::GetMountPoints(profile_)->GetRegisteredPath(
-      mount_point_name_, &unused);
+  fileapi::ExternalMountPoints* const mount_points =
+      fileapi::ExternalMountPoints::GetSystemInstance();
+  DCHECK(mount_points);
+  return mount_points->GetRegisteredPath(mount_point_name_, &unused);
 }
 
 void DriveIntegrationService::AddObserver(
     DriveIntegrationServiceObserver* observer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   observers_.AddObserver(observer);
 }
 
 void DriveIntegrationService::RemoveObserver(
     DriveIntegrationServiceObserver* observer) {
@@ skipping 56 matching lines @@
 
 void DriveIntegrationService::AddDriveMountPoint() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(INITIALIZED, state_);
   DCHECK(enabled_);
 
   const base::FilePath& drive_mount_point =
       util::GetDriveMountPointPath(profile_);
   if (mount_point_name_.empty())
     mount_point_name_ = drive_mount_point.BaseName().AsUTF8Unsafe();
-  fileapi::ExternalMountPoints* mount_points =
-      BrowserContext::GetMountPoints(profile_);
+  fileapi::ExternalMountPoints* const mount_points =
+      fileapi::ExternalMountPoints::GetSystemInstance();
   DCHECK(mount_points);
 
   bool success = mount_points->RegisterFileSystem(
       mount_point_name_,
       fileapi::kFileSystemTypeDrive,
       fileapi::FileSystemMountOption(),
       drive_mount_point);
 
   if (success) {
     util::Log(logging::LOG_INFO, "Drive mount point is added");
     FOR_EACH_OBSERVER(DriveIntegrationServiceObserver, observers_,
                       OnFileSystemMounted());
   }
 }
 
 void DriveIntegrationService::RemoveDriveMountPoint() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!mount_point_name_.empty()) {
     job_list()->CancelAllJobs();
 
     FOR_EACH_OBSERVER(DriveIntegrationServiceObserver, observers_,
                       OnFileSystemBeingUnmounted());
 
-    fileapi::ExternalMountPoints* mount_points =
-        BrowserContext::GetMountPoints(profile_);
+    fileapi::ExternalMountPoints* const mount_points =
+        fileapi::ExternalMountPoints::GetSystemInstance();
     DCHECK(mount_points);
 
     mount_points->RevokeFileSystem(mount_point_name_);
     util::Log(logging::LOG_INFO, "Drive mount point is removed");
   }
 }
 
 void DriveIntegrationService::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DCHECK_EQ(NOT_INITIALIZED, state_);
@@ skipping 153 matching lines @@
         profile, preference_watcher,
         NULL, std::string(), base::FilePath(), NULL);
   } else {
     service = factory_for_test_->Run(profile);
   }
 
   return service;
 }
 
 }  // namespace drive