Revert of Move ScriptState::GetExecutionContext (Part 5)

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

 /*
  * Copyright (C) 2010 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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "modules/filesystem/Entry.h"
 
 #include "bindings/core/v8/ScriptState.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/fileapi/FileError.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/VoidCallback.h"
 #include "modules/filesystem/DirectoryEntry.h"
 #include "modules/filesystem/EntryCallback.h"
 #include "modules/filesystem/ErrorCallback.h"
 #include "modules/filesystem/FileSystemCallbacks.h"
 #include "modules/filesystem/MetadataCallback.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "platform/wtf/text/StringBuilder.h"
 
 namespace blink {
 
 Entry::Entry(DOMFileSystemBase* file_system, const String& full_path)
     : EntryBase(file_system, full_path) {}
 
 DOMFileSystem* Entry::filesystem(ScriptState* script_state) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
     UseCounter::Count(
-        ExecutionContext::From(script_state),
+        script_state->GetExecutionContext(),
         UseCounter::kEntry_Filesystem_AttributeGetter_IsolatedFileSystem);
   return filesystem();
 }
 
 void Entry::getMetadata(ScriptState* script_state,
                         MetadataCallback* success_callback,
                         ErrorCallback* error_callback) {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_GetMetadata_Method_IsolatedFileSystem);
   file_system_->GetMetadata(this, success_callback,
                             ScriptErrorCallback::Wrap(error_callback));
 }
 
 void Entry::moveTo(ScriptState* script_state,
                    DirectoryEntry* parent,
                    const String& name,
                    EntryCallback* success_callback,
                    ErrorCallback* error_callback) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_MoveTo_Method_IsolatedFileSystem);
   file_system_->Move(this, parent, name, success_callback,
                      ScriptErrorCallback::Wrap(error_callback));
 }
 
 void Entry::copyTo(ScriptState* script_state,
                    DirectoryEntry* parent,
                    const String& name,
                    EntryCallback* success_callback,
                    ErrorCallback* error_callback) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_CopyTo_Method_IsolatedFileSystem);
   file_system_->Copy(this, parent, name, success_callback,
                      ScriptErrorCallback::Wrap(error_callback));
 }
 
 void Entry::remove(ScriptState* script_state,
                    VoidCallback* success_callback,
                    ErrorCallback* error_callback) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_Remove_Method_IsolatedFileSystem);
   file_system_->Remove(this, success_callback,
                        ScriptErrorCallback::Wrap(error_callback));
 }
 
 void Entry::getParent(ScriptState* script_state,
                       EntryCallback* success_callback,
                       ErrorCallback* error_callback) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_GetParent_Method_IsolatedFileSystem);
   file_system_->GetParent(this, success_callback,
                           ScriptErrorCallback::Wrap(error_callback));
 }
 
 String Entry::toURL(ScriptState* script_state) const {
   if (file_system_->GetType() == kFileSystemTypeIsolated)
-    UseCounter::Count(ExecutionContext::From(script_state),
+    UseCounter::Count(script_state->GetExecutionContext(),
                       UseCounter::kEntry_ToURL_Method_IsolatedFileSystem);
   return static_cast<const EntryBase*>(this)->toURL();
 }
 
 DEFINE_TRACE(Entry) {
   EntryBase::Trace(visitor);
 }
 
 }  // namespace blink