[DevTools] Eliminate frameId and isContentScript from js protocol.

chrome/test/chromedriver/chrome/navigation_tracker.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/chromedriver/chrome/navigation_tracker.h"
 
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/browser_info.h"
 #include "chrome/test/chromedriver/chrome/devtools_client.h"
@@ skipping 311 matching lines @@
         // them.
         ResetLoadingState(kLoading);
       }
     }
   } else if (method == "Runtime.executionContextCreated") {
     if (!IsExpectingFrameLoadingEvents()) {
       int execution_context_id;
       if (!params.GetInteger("context.id", &execution_context_id))
         return Status(kUnknownError, "missing or invalid 'context.id'");
       std::string frame_id;
-      if (!params.GetString("context.frameId", &frame_id))
-        return Status(kUnknownError, "missing or invalid 'context.frameId'");
+      if (!params.GetString("context.auxData.frameId", &frame_id)) {
+        // TODO(samuong): remove this when we stop supporting Chrome 53.
+        if (!params.GetString("context.frameId", &frame_id))
+          return Status(kUnknownError, "missing or invalid 'context.frameId'");
+      }
       if (frame_id == dummy_frame_id_)
         dummy_execution_context_id_ = execution_context_id;
       else
         execution_context_set_.insert(execution_context_id);
     }
   } else if (method == "Runtime.executionContextDestroyed") {
     if (!IsExpectingFrameLoadingEvents()) {
       int execution_context_id;
       if (!params.GetInteger("executionContextId", &execution_context_id))
         return Status(kUnknownError, "missing or invalid 'context.id'");
@@ skipping 88 matching lines @@
   // modal dialogs. This pauses the render process so we need to be careful not
   // to issue Runtime.evaluate commands while an alert is up, otherwise the call
   // will block and timeout. For details refer to
   // https://bugs.chromium.org/p/chromedriver/issues/detail?id=1381.
   // TODO(samuong): Remove this once we stop supporting M51.
   if (browser_info_->browser_name == "chrome")
     return browser_info_->build_no >= 2743;
   else
     return browser_info_->major_version >= 52;
 }