Extract external file systems handling from isolated context.

webkit/fileapi/file_system_context.cc

Index: webkit/fileapi/file_system_context.cc
diff --git a/webkit/fileapi/file_system_context.cc b/webkit/fileapi/file_system_context.cc
index 44142e762efb834f8988ecb0153fe8c548248bbe..0520c64a785494b010689c2a41db02dbcb599147 100644
--- a/webkit/fileapi/file_system_context.cc
+++ b/webkit/fileapi/file_system_context.cc
@@ -9,6 +9,7 @@
 #include "base/stl_util.h"
 #include "base/single_thread_task_runner.h"
 #include "googleurl/src/gurl.h"
+#include "webkit/fileapi/external_mount_points.h"
 #include "webkit/fileapi/file_system_file_util.h"
 #include "webkit/fileapi/file_system_operation.h"
 #include "webkit/fileapi/file_system_options.h"
@@ -76,7 +77,11 @@ FileSystemContext::FileSystemContext(
   }
 #if defined(OS_CHROMEOS)
   external_provider_.reset(
-      new chromeos::CrosMountPointProvider(special_storage_policy));
+      new chromeos::CrosMountPointProvider(
+          special_storage_policy,
+          // TODO(tbarzic): Switch this to |external_mount_points_|.
+          fileapi::ExternalMountPoints::GetSystemInstance(),
+          fileapi::ExternalMountPoints::GetSystemInstance()));
 #endif
 }
 
@@ -137,11 +142,9 @@ FileSystemMountPointProvider* FileSystemContext::GetMountPointProvider(
     case kFileSystemTypeDeviceMedia:
       return isolated_provider_.get();
     case kFileSystemTypeNativeLocal:
-#if defined(OS_CHROMEOS)
       return external_provider_.get();
-#else
+    case kFileSystemTypeIsolatedNativeLocal:
       return isolated_provider_.get();
-#endif
     default:
       if (provider_map_.find(type) != provider_map_.end())
         return provider_map_.find(type)->second;
@@ -244,6 +247,7 @@ FileSystemOperation* FileSystemContext::CreateFileSystemOperation(
       *error_code = base::PLATFORM_FILE_ERROR_INVALID_URL;
     return NULL;
   }
+
   FileSystemMountPointProvider* mount_point_provider =
       GetMountPointProvider(url.type());
   if (!mount_point_provider) {