[DevTools] Eliminate frameId and isContentScript from js protocol.

chrome/test/chromedriver/chrome/frame_tracker_unittest.cc

 // Copyright (c) 2012 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 <string>
 
 #include "base/json/json_reader.h"
 #include "base/values.h"
 #include "chrome/test/chromedriver/chrome/frame_tracker.h"
 #include "chrome/test/chromedriver/chrome/status.h"
@@ skipping 24 matching lines @@
   ASSERT_EQ(kOk,
             tracker.OnEvent(&client, "Page.frameNavigated", nav_params).code());
   ASSERT_TRUE(tracker.GetContextIdForFrame("f", &context_id).IsOk());
   nav_params.Clear();
   ASSERT_EQ(kOk,
             tracker.OnEvent(&client, "Page.frameNavigated", nav_params).code());
   ASSERT_EQ(kNoSuchExecutionContext,
             tracker.GetContextIdForFrame("f", &context_id).code());
 }
 
+TEST(FrameTracker, AuxData) {
+  StubDevToolsClient client;
+  FrameTracker tracker(&client);
+  int context_id = -1;
+  ASSERT_TRUE(tracker.GetContextIdForFrame("f", &context_id).IsError());
+  ASSERT_EQ(-1, context_id);
+
+  const char context[] = "{\"id\":100,\"auxData\":{}}";
+  base::DictionaryValue params;
+  params.Set("context", base::JSONReader::Read(context));
+  params.SetString("context.auxData.frameId", "f");
+  params.SetBoolean("context.auxData.isDefault", true);
+  ASSERT_EQ(kOk,
+            tracker.OnEvent(&client, "Runtime.executionContextCreated", params)
+                .code());
+  ASSERT_EQ(kNoSuchExecutionContext,
+            tracker.GetContextIdForFrame("foo", &context_id).code());
+  ASSERT_EQ(-1, context_id);
+  ASSERT_TRUE(tracker.GetContextIdForFrame("f", &context_id).IsOk());
+  ASSERT_EQ(100, context_id);
+}
+
 TEST(FrameTracker, CanUpdateFrameContextId) {
   StubDevToolsClient client;
   FrameTracker tracker(&client);
 
   const char context[] = "{\"id\":1,\"frameId\":\"f\"}";
   base::DictionaryValue params;
   params.Set("context", base::JSONReader::Read(context));
   ASSERT_EQ(kOk,
             tracker.OnEvent(&client, "Runtime.executionContextCreated", params)
                 .code());
@@ skipping 24 matching lines @@
   ASSERT_EQ(1, context_id);
 
   params.SetInteger("context.id", 2);
   params.SetString("context.type", "Extension");
   ASSERT_EQ(kOk,
             tracker.OnEvent(&client, "Runtime.executionContextCreated", params)
                 .code());
   ASSERT_TRUE(tracker.GetContextIdForFrame("f", &context_id).IsOk());
   ASSERT_EQ(1, context_id);
 }