Revert of Move ScriptState::GetExecutionContext (Part 5)

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

Index: third_party/WebKit/Source/modules/filesystem/Entry.cpp
diff --git a/third_party/WebKit/Source/modules/filesystem/Entry.cpp b/third_party/WebKit/Source/modules/filesystem/Entry.cpp
index 5326805344e940824da0dbd7028ae37dda2f416d..7201b219be61404ce8f2ba7750aba5c1da117225 100644
--- a/third_party/WebKit/Source/modules/filesystem/Entry.cpp
+++ b/third_party/WebKit/Source/modules/filesystem/Entry.cpp
@@ -30,7 +30,6 @@
 #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"
@@ -50,7 +49,7 @@ Entry::Entry(DOMFileSystemBase* file_system, const String& 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();
 }
@@ -59,7 +58,7 @@ 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));
@@ -71,7 +70,7 @@ void Entry::moveTo(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_MoveTo_Method_IsolatedFileSystem);
   file_system_->Move(this, parent, name, success_callback,
                      ScriptErrorCallback::Wrap(error_callback));
@@ -83,7 +82,7 @@ void Entry::copyTo(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_CopyTo_Method_IsolatedFileSystem);
   file_system_->Copy(this, parent, name, success_callback,
                      ScriptErrorCallback::Wrap(error_callback));
@@ -93,7 +92,7 @@ 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));
@@ -103,7 +102,7 @@ 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));
@@ -111,7 +110,7 @@ void Entry::getParent(ScriptState* script_state,
 
 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();
 }