Remove pre-Oilpan protections from LocalFileSystem.

third_party/WebKit/Source/modules/filesystem/LocalFileSystem.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 65 matching lines @@
 {
     return new LocalFileSystem(std::move(client));
 }
 
 LocalFileSystem::~LocalFileSystem()
 {
 }
 
 void LocalFileSystem::resolveURL(ExecutionContext* context, const KURL& fileSystemURL, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    ExecutionContext* contextPtr(context);
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
-        bind(&LocalFileSystem::resolveURLInternal, this, contextPtr, fileSystemURL, wrapper),
-        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, contextPtr, wrapper));
+        bind(&LocalFileSystem::resolveURLInternal, this, context, fileSystemURL, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
 void LocalFileSystem::requestFileSystem(ExecutionContext* context, FileSystemType type, long long size, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    ExecutionContext* contextPtr(context);
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
-        bind(&LocalFileSystem::fileSystemAllowedInternal, this, contextPtr, type, wrapper),
-        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, contextPtr, wrapper));
+        bind(&LocalFileSystem::fileSystemAllowedInternal, this, context, type, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
 void LocalFileSystem::deleteFileSystem(ExecutionContext* context, FileSystemType type, PassOwnPtr<AsyncFileSystemCallbacks> callbacks)
 {
-    ExecutionContext* contextPtr(context);
     ASSERT(context);
     ASSERT_WITH_SECURITY_IMPLICATION(context->isDocument());
 
     CallbackWrapper* wrapper = new CallbackWrapper(std::move(callbacks));
     requestFileSystemAccessInternal(context,
-        bind(&LocalFileSystem::deleteFileSystemInternal, this, contextPtr, type, wrapper),
-        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, contextPtr, wrapper));
+        bind(&LocalFileSystem::deleteFileSystemInternal, this, context, type, wrapper),
+        bind(&LocalFileSystem::fileSystemNotAllowedInternal, this, context, wrapper));
 }
 
-WebFileSystem* LocalFileSystem::fileSystem() const
+WebFileSystem* LocalFileSystem::getFileSystem() const
 {
     Platform* platform = Platform::current();
     if (!platform)
         return nullptr;
-    return Platform::current()->fileSystem();
+
+    return platform->fileSystem();
 }
 
 void LocalFileSystem::requestFileSystemAccessInternal(ExecutionContext* context, std::unique_ptr<SameThreadClosure> allowed, std::unique_ptr<SameThreadClosure> denied)
 {
     if (!client()) {
         (*denied)();
         return;
     }
     if (!context->isDocument()) {
         if (!client()->requestFileSystemAccessSync(context)) {
@@ skipping 18 matching lines @@
     CallbackWrapper* callbacks)
 {
     context->postTask(BLINK_FROM_HERE, createSameThreadTask(&reportFailure, passed(callbacks->release()), FileError::ABORT_ERR));
 }
 
 void LocalFileSystem::fileSystemAllowedInternal(
     ExecutionContext* context,
     FileSystemType type,
     CallbackWrapper* callbacks)
 {
-    if (!fileSystem()) {
+    WebFileSystem* fileSystem = getFileSystem();
+    if (!fileSystem) {
         fileSystemNotAvailable(context, callbacks);
         return;
     }
-
     KURL storagePartition = KURL(KURL(), context->getSecurityOrigin()->toString());
-    fileSystem()->openFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release());
+    fileSystem->openFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release());
 }
 
 void LocalFileSystem::resolveURLInternal(
     ExecutionContext* context,
     const KURL& fileSystemURL,
     CallbackWrapper* callbacks)
 {
-    if (!fileSystem()) {
+    WebFileSystem* fileSystem = getFileSystem();
+    if (!fileSystem) {
         fileSystemNotAvailable(context, callbacks);
         return;
     }
-    fileSystem()->resolveURL(fileSystemURL, callbacks->release());
+    fileSystem->resolveURL(fileSystemURL, callbacks->release());
 }
 
 void LocalFileSystem::deleteFileSystemInternal(
     ExecutionContext* context,
     FileSystemType type,
     CallbackWrapper* callbacks)
 {
-    if (!fileSystem()) {
+    WebFileSystem* fileSystem = getFileSystem();
+    if (!fileSystem) {
         fileSystemNotAvailable(context, callbacks);
         return;
     }
     KURL storagePartition = KURL(KURL(), context->getSecurityOrigin()->toString());
-    fileSystem()->deleteFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release());
+    fileSystem->deleteFileSystem(storagePartition, static_cast<WebFileSystemType>(type), callbacks->release());
 }
 
 LocalFileSystem::LocalFileSystem(PassOwnPtr<FileSystemClient> client)
     : m_client(std::move(client))
 {
 }
 
 const char* LocalFileSystem::supplementName()
 {
     return "LocalFileSystem";
@@ skipping 13 matching lines @@
 {
     frame.provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
 void provideLocalFileSystemToWorker(WorkerClients* clients, PassOwnPtr<FileSystemClient> client)
 {
     clients->provideSupplement(LocalFileSystem::supplementName(), LocalFileSystem::create(std::move(client)));
 }
 
 } // namespace blink