Pass BrowserContext to drive::MountPointProviderDelegate.

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 2284 matching lines @@
 
 void ChromeContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
     std::vector<std::string>* additional_allowed_schemes) {
   ContentBrowserClient::GetAdditionalAllowedSchemesForFileSystem(
       additional_allowed_schemes);
   additional_allowed_schemes->push_back(kChromeUIScheme);
   additional_allowed_schemes->push_back(extensions::kExtensionScheme);
 }
 
 void ChromeContentBrowserClient::GetAdditionalFileSystemMountPointProviders(
+    content::BrowserContext* browser_context,
     const base::FilePath& storage_partition_path,
     quota::SpecialStoragePolicy* special_storage_policy,
-    fileapi::ExternalMountPoints* external_mount_points,
     ScopedVector<fileapi::FileSystemMountPointProvider>* additional_providers) {
 #if !defined(OS_ANDROID)
   base::SequencedWorkerPool* pool = content::BrowserThread::GetBlockingPool();
   additional_providers->push_back(new MediaFileSystemMountPointProvider(
       storage_partition_path,
       pool->GetSequencedTaskRunner(pool->GetNamedSequenceToken(
           MediaFileSystemMountPointProvider::kMediaTaskRunnerName)).get()));
 #endif
 #if defined(OS_CHROMEOS)
+  fileapi::ExternalMountPoints* external_mount_points =
+      content::BrowserContext::GetMountPoints(browser_context);
   DCHECK(external_mount_points);
   chromeos::CrosMountPointProvider* cros_mount_provider =
       new chromeos::CrosMountPointProvider(
-          new drive::MountPointProviderDelegate(external_mount_points),
+          new drive::MountPointProviderDelegate(browser_context),
           special_storage_policy,
           external_mount_points,
           fileapi::ExternalMountPoints::GetSystemInstance());
   cros_mount_provider->AddSystemMountPoints();
   DCHECK(cros_mount_provider->CanHandleType(fileapi::kFileSystemTypeExternal));
   additional_providers->push_back(cros_mount_provider);
 #endif
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
@@ skipping 96 matching lines @@
 #if defined(USE_NSS)
 crypto::CryptoModuleBlockingPasswordDelegate*
     ChromeContentBrowserClient::GetCryptoPasswordDelegate(
         const GURL& url) {
   return chrome::NewCryptoModuleBlockingDialogDelegate(
       chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 }  // namespace chrome