Drive: Mount/Unmount GoogleDrive on Files App when the file system is mounted/unmounted.

chrome/browser/chromeos/gdata/gdata_system_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/gdata/gdata_system_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 #include "chrome/browser/chromeos/gdata/drive_webapps_registry.h"
 #include "chrome/browser/chromeos/gdata/gdata_contacts_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_documents_service.h"
 #include "chrome/browser/chromeos/gdata/gdata_download_observer.h"
 #include "chrome/browser/chromeos/gdata/gdata_file_system.h"
-#include "chrome/browser/chromeos/gdata/gdata_file_system_proxy.h"
 #include "chrome/browser/chromeos/gdata/gdata_sync_client.h"
 #include "chrome/browser/chromeos/gdata/gdata_uploader.h"
 #include "chrome/browser/chromeos/gdata/gdata_util.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_dependency_manager.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/fileapi/file_system_context.h"
-#include "webkit/fileapi/file_system_mount_point_provider.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
 
 namespace gdata {
 namespace {
 
 // Used in test to setup system service.
 DocumentsServiceInterface* g_test_documents_service = NULL;
 const std::string* g_test_cache_root = NULL;
@@ skipping 62 matching lines @@
   download_observer_.reset();
   file_system_.reset();
   webapps_registry_.reset();
   uploader_.reset();
   documents_service_.reset();
 }
 
 void GDataSystemService::AddDriveMountPoint() {
   if (!gdata::util::IsGDataAvailable(profile_))
     return;
-
-  const FilePath mount_point = gdata::util::GetGDataMountPointPath();
-  fileapi::ExternalFileSystemMountPointProvider* provider =
-      BrowserContext::GetFileSystemContext(profile_)->external_provider();
-  if (provider && !provider->HasMountPoint(mount_point)) {
-    provider->AddRemoteMountPoint(
-        mount_point,
-        new GDataFileSystemProxy(file_system_.get()));
-  }
+  file_system_->AddDriveMountPoint();
 }
 
 void GDataSystemService::RemoveDriveMountPoint() {
-  const FilePath mount_point = gdata::util::GetGDataMountPointPath();
-  fileapi::ExternalFileSystemMountPointProvider* provider =
-      BrowserContext::GetFileSystemContext(profile_)->external_provider();
-  if (provider && provider->HasMountPoint(mount_point))
-    provider->RemoveMountPoint(mount_point);
+  file_system_->RemoveDriveMountPoint();
 }
 
 //===================== GDataSystemServiceFactory =============================
 
 // static
 GDataSystemService* GDataSystemServiceFactory::GetForProfile(
     Profile* profile) {
   return static_cast<GDataSystemService*>(
       GetInstance()->GetServiceForProfile(profile, true));
 }
@@ skipping 48 matching lines @@
       g_test_cache_root ? FilePath(*g_test_cache_root) :
                           GDataCache::GetCacheRootPath(profile);
   delete g_test_cache_root;
   g_test_cache_root = NULL;
 
   service->Initialize(documents_service, cache_root);
   return service;
 }
 
 }  // namespace gdata