Revert of Move ScriptState::GetExecutionContext (Part 5)

third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp

 /*
  * Copyright (C) 2012 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 19 matching lines @@
 
 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8PerIsolateData.h"
 #include "core/dom/DOMStringList.h"
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/events/EventListener.h"
 #include "core/frame/LocalFrame.h"
 #include "core/inspector/InspectedFrames.h"
 #include "core/inspector/V8InspectorString.h"
 #include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/GlobalIndexedDB.h"
 #include "modules/indexeddb/IDBCursor.h"
 #include "modules/indexeddb/IDBCursorWithValue.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBFactory.h"
@@ skipping 161 matching lines @@
       return;
     }
     idb_open_db_request->addEventListener(EventTypeNames::upgradeneeded,
                                           upgrade_callback, false);
     idb_open_db_request->addEventListener(EventTypeNames::success,
                                           open_callback, false);
   }
   virtual void Execute(IDBDatabase*) = 0;
   virtual RequestCallback* GetRequestCallback() = 0;
   ExecutionContext* Context() const {
-    return ExecutionContext::From(script_state_.Get());
+    return script_state_->GetExecutionContext();
   }
   ScriptState* GetScriptState() const { return script_state_.Get(); }
 
  private:
   RefPtr<ScriptState> script_state_;
 };
 
 template <typename RequestCallback>
 class OpenDatabaseCallback final : public EventListener {
  public:
@@ skipping 333 matching lines @@
     // Continue cursor before making injected script calls, otherwise
     // transaction might be finished.
     DummyExceptionStateForTesting exception_state;
     idb_cursor->Continue(nullptr, nullptr, exception_state);
     if (exception_state.HadException()) {
       request_callback_->sendFailure(
           Response::Error("Could not continue cursor."));
       return;
     }
 
-    Document* document =
-        ToDocument(ExecutionContext::From(script_state_.Get()));
+    Document* document = ToDocument(script_state_->GetExecutionContext());
     if (!document)
       return;
     ScriptState* script_state = script_state_.Get();
     ScriptState::Scope scope(script_state);
     v8::Local<v8::Context> context = script_state->GetContext();
     v8_inspector::StringView object_group =
         ToV8InspectorStringView(kIndexedDBObjectGroup);
     std::unique_ptr<DataEntry> data_entry =
         DataEntry::create()
             .setKey(v8_session_->wrapObject(
@@ skipping 447 matching lines @@
                              document->GetSecurityOrigin()->ToRawString()),
       false);
 }
 
 DEFINE_TRACE(InspectorIndexedDBAgent) {
   visitor->Trace(inspected_frames_);
   InspectorBaseAgent::Trace(visitor);
 }
 
 }  // namespace blink