Revert "Reland "DevTools: allow addScriptToEvaluateOnNewDocument accept...

Revert "Reland "DevTools: allow addScriptToEvaluateOnNewDocument accept optional worldName parameter.""

This reverts commit fad0ee09.

Reason for revert: <INSERT REASONING HERE>

Original change's description:
> Reland "DevTools: allow addScriptToEvaluateOnNewDocument accept optional worldName parameter."
> 
> This is a reland of 3321d814
> 
> Original change's description:
> > DevTools: allow addScriptToEvaluateOnNewDocument accept optional worldName parameter.
> > 
> > Change-Id: Ic22c1bf38aaf8e5d3e7caabf3c686c8c45b985b0
> > Reviewed-on: https://chromium-review.googlesource.com/1244460
> > Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> > Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#594161}
> 
> Change-Id: I8a33e70976a2e52b7f69c5b2d0fa4e5af3594c6a
> Reviewed-on: https://chromium-review.googlesource.com/1246901
> Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
> Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
> Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#594477}

TBR=dgozman@chromium.org,lushnikov@chromium.org,pfeldman@chromium.org

Change-Id: I64854d5d9f698e559619aec46b1f8de9fd56fd99
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/1246597Reviewed-by: Pavel Feldman <pfeldman@chromium.org>
Commit-Queue: Pavel Feldman <pfeldman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#594497}

third_party/WebKit/LayoutTests/inspector-protocol/page/add-script-to-evaluate-in-world-expected.txt

-Tests that Page.addScriptToEvaluateOnNewDocument is executed in the given world
-Adding scripts
-world#0
-message from 0
-world#1
-message from 1
-world#2
-message from 2
-world#3
-message from 3
-world#4
-message from 4
-Removing scripts
-

third_party/WebKit/LayoutTests/inspector-protocol/page/add-script-to-evaluate-in-world.js

-(async function(testRunner) {
-  const {page, session, dp} = await testRunner.startBlank(
-      'Tests that Page.addScriptToEvaluateOnNewDocument is executed in the given world');
-  dp.Runtime.enable();
-  dp.Page.enable();
-
-  const scriptIds = [];
-  dp.Runtime.onConsoleAPICalled(msg => testRunner.log(msg.params.args[0].value));
-  dp.Runtime.onExecutionContextCreated(msg => {
-    if (msg.params.context.name.includes('world'))
-      testRunner.log(msg.params.context.name);
-  });
-
-  testRunner.log('Adding scripts');
-  for (let i = 0; i < 5; ++i) {
-    const result = await dp.Page.addScriptToEvaluateOnNewDocument({source: `
-      console.log('message from ${i}');`, worldName: `world#${i}`});
-    scriptIds.push(result.result.identifier);
-  }
-
-  await session.navigate('../resources/blank.html');
-
-  testRunner.log('Removing scripts');
-  for (let identifier of scriptIds) {
-    const response = await dp.Page.removeScriptToEvaluateOnNewDocument({identifier});
-    if (!response.result)
-      testRunner.log('Failed script removal');
-  }
-
-  await session.navigate('../resources/blank.html');
-
-  testRunner.completeTest();
-})

third_party/WebKit/LayoutTests/inspector-protocol/page/add-script-to-evaluate-on-load-expected.txt

 Tests that Page.addScriptToEvaluateOnLoad is executed in the order of addition
-Adding scripts
 message from 0
 message from 1
 message from 2
 message from 3
 message from 4
-Removing scripts
+message from 5
+message from 6
+message from 7
+message from 8
+message from 9
+message from 10
+message from 11
+message from 12
+message from 13
+message from 14
 

third_party/WebKit/LayoutTests/inspector-protocol/page/add-script-to-evaluate-on-load.js

@@ -4,27 +4,13 @@
   dp.Runtime.enable();
   dp.Page.enable();
 
-  const scriptIds = [];
   dp.Runtime.onConsoleAPICalled(msg => testRunner.log(msg.params.args[0].value));
 
-  testRunner.log('Adding scripts');
-  for (let i = 0; i < 5; ++i) {
-    const result = await dp.Page.addScriptToEvaluateOnNewDocument({source: `
+  for (let i = 0; i < 15; ++i) {
+    await dp.Page.addScriptToEvaluateOnNewDocument({source: `
       console.log('message from ${i}');
     `});
-    scriptIds.push(result.result.identifier);
   }
-
-  await session.navigate('../resources/blank.html');
-
-  testRunner.log('Removing scripts');
-  for (let identifier of scriptIds) {
-    const response = await dp.Page.removeScriptToEvaluateOnNewDocument({identifier});
-    if (!response.result)
-      testRunner.log('Failed script removal');
-  }
-
   await session.navigate('../resources/blank.html');
-
   testRunner.completeTest();
 })

third_party/blink/renderer/core/inspector/browser_protocol.pdl

@@ -4870,10 +4870,6 @@ domain Page
   command addScriptToEvaluateOnNewDocument
     parameters
       string source
-      # If specified, creates an isolated world with the given name and evaluates given script in it.
-      # This world name will be used as the ExecutionContextDescription::name when the corresponding
-      # event is emitted.
-      experimental optional string worldName
     returns
       # Identifier of the added script.
       ScriptIdentifier identifier

third_party/blink/renderer/core/inspector/inspector_page_agent.cc

@@ -70,8 +70,6 @@
 #include "third_party/blink/renderer/core/probe/core_probes.h"
 #include "third_party/blink/renderer/core/style/computed_style.h"
 #include "third_party/blink/renderer/platform/bindings/dom_wrapper_world.h"
-#include "third_party/blink/renderer/platform/json/json_parser.h"
-#include "third_party/blink/renderer/platform/json/json_values.h"
 #include "third_party/blink/renderer/platform/loader/fetch/memory_cache.h"
 #include "third_party/blink/renderer/platform/loader/fetch/resource.h"
 #include "third_party/blink/renderer/platform/loader/fetch/resource_fetcher.h"
@@ -550,29 +548,23 @@ Response InspectorPageAgent::disable() {
   return Response::OK();
 }
 
-Response InspectorPageAgent::addScriptToEvaluateOnNewDocument(
-    const String& source,
-    Maybe<String> world_name,
-    String* identifier) {
+Response InspectorPageAgent::addScriptToEvaluateOnLoad(const String& source,
+                                                       String* identifier) {
   std::vector<WTF::String> keys = scripts_to_evaluate_on_load_.Keys();
   auto result = std::max_element(
       keys.begin(), keys.end(), [](const WTF::String& a, const WTF::String& b) {
         return Decimal::FromString(a) < Decimal::FromString(b);
       });
   if (result == keys.end()) {
-    *identifier = String::Number(1);
+    scripts_to_evaluate_on_load_.Set(String::Number(1), source);
   } else {
-    *identifier = String::Number(Decimal::FromString(*result).ToDouble() + 1);
+    scripts_to_evaluate_on_load_.Set(
+        String::Number(Decimal::FromString(*result).ToDouble() + 1), source);
   }
-
-  std::unique_ptr<JSONObject> script = JSONObject::Create();
-  script->SetString("source", source);
-  script->SetString("world_name", world_name.fromMaybe(""));
-  scripts_to_evaluate_on_load_.Set(*identifier, script->ToJSONString());
   return Response::OK();
 }
 
-Response InspectorPageAgent::removeScriptToEvaluateOnNewDocument(
+Response InspectorPageAgent::removeScriptToEvaluateOnLoad(
     const String& identifier) {
   if (scripts_to_evaluate_on_load_.Get(identifier).IsNull())
     return Response::Error("Script not found");
@@ -580,15 +572,15 @@ Response InspectorPageAgent::removeScriptToEvaluateOnNewDocument(
   return Response::OK();
 }
 
-Response InspectorPageAgent::addScriptToEvaluateOnLoad(const String& source,
-                                                       String* identifier) {
-  return addScriptToEvaluateOnNewDocument(source, Maybe<String>(""),
-                                          identifier);
+Response InspectorPageAgent::addScriptToEvaluateOnNewDocument(
+    const String& source,
+    String* identifier) {
+  return addScriptToEvaluateOnLoad(source, identifier);
 }
 
-Response InspectorPageAgent::removeScriptToEvaluateOnLoad(
+Response InspectorPageAgent::removeScriptToEvaluateOnNewDocument(
     const String& identifier) {
-  return removeScriptToEvaluateOnNewDocument(identifier);
+  return removeScriptToEvaluateOnLoad(identifier);
 }
 
 Response InspectorPageAgent::setLifecycleEventsEnabled(bool enabled) {
@@ -851,45 +843,10 @@ void InspectorPageAgent::DidClearDocumentOfWindowObject(LocalFrame* frame) {
               return Decimal::FromString(a) < Decimal::FromString(b);
             });
 
-  HashMap<String, int> world_id_by_name;
   for (const WTF::String& key : keys) {
-    const String script = scripts_to_evaluate_on_load_.Get(key);
-    std::unique_ptr<JSONObject> object = JSONObject::From(ParseJSON(script));
-    String source;
-    DCHECK(object->GetString("source", &source));
-    String world_name;
-    DCHECK(object->GetString("world_name", &world_name));
-
-    if (world_name.IsEmpty()) {
-      frame->GetScriptController().ExecuteScriptInMainWorld(source);
-      continue;
-    }
-
-    auto it = world_id_by_name.find(world_name);
-    int world_id = 0;
-    if (it != world_id_by_name.end()) {
-      world_id = it->value;
-    } else {
-      scoped_refptr<DOMWrapperWorld> world =
-          frame->GetScriptController().CreateNewInspectorIsolatedWorld(
-              world_name);
-      if (!world)
-        continue;
-      world_id = world->GetWorldId();
-      world_id_by_name.Set(world_name, world_id);
-
-      scoped_refptr<SecurityOrigin> security_origin =
-          frame->GetSecurityContext()->GetSecurityOrigin()->IsolatedCopy();
-      security_origin->GrantUniversalAccess();
-      DOMWrapperWorld::SetIsolatedWorldSecurityOrigin(world_id,
-                                                      security_origin);
-    }
-
-    v8::HandleScope handle_scope(V8PerIsolateData::MainThreadIsolate());
-    frame->GetScriptController().ExecuteScriptInIsolatedWorld(
-        world_id, source, KURL(), kNotSharableCrossOrigin);
+    const WTF::String& script = scripts_to_evaluate_on_load_.Get(key);
+    frame->GetScriptController().ExecuteScriptInMainWorld(script);
   }
-
   if (!script_to_evaluate_on_load_once_.IsEmpty()) {
     frame->GetScriptController().ExecuteScriptInMainWorld(
         script_to_evaluate_on_load_once_);

third_party/blink/renderer/core/inspector/inspector_page_agent.h

@@ -115,7 +115,6 @@ class CORE_EXPORT InspectorPageAgent final
       const String& identifier) override;
   protocol::Response addScriptToEvaluateOnNewDocument(
       const String& source,
-      Maybe<String> world_name,
       String* identifier) override;
   protocol::Response removeScriptToEvaluateOnNewDocument(
       const String& identifier) override;