Gave some content_shell constants unique names and better docs

content_shell wants to replicate a chome constant at several
places which caused collisions in jumbo build experiments. This
give the replicas unique names and fixes the documentation which
was a bit outdated.

Bug: 886902
Change-Id: Ibf65de50bb2f938392fcecc910d70a4c4182c87d
Reviewed-on: https://chromium-review.googlesource.com/1233715
Commit-Queue: Daniel Bratell <bratell@opera.com>
Reviewed-by: Dmitry Gozman <dgozman@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Commit-Position: refs/heads/master@{#593143}

chrome/browser/devtools/devtools_ui_bindings.cc

@@ -109,7 +109,11 @@ static const char kConfigNetworkDiscoveryEnabled[] = "networkDiscoveryEnabled";
 static const char kConfigNetworkDiscoveryConfig[] = "networkDiscoveryConfig";
 
 // This constant should be in sync with
-// the constant at shell_devtools_frontend.cc.
+// the constant
+// kShellMaxMessageChunkSize in content/shell/browser/shell_devtools_bindings.cc
+// and
+// kLayoutTestMaxMessageChunkSize in
+// content/shell/browser/layout_test/devtools_protocol_test_bindings.cc.
 const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
 
 typedef std::vector<DevToolsUIBindings*> DevToolsUIBindingsList;

content/shell/browser/layout_test/devtools_protocol_test_bindings.cc

@@ -24,8 +24,10 @@ namespace content {
 
 namespace {
 // This constant should be in sync with
-// the constant at devtools_ui_bindings.cc.
-const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
+// the constant
+// kMaxMessageChunkSize in chrome/browser/devtools/devtools_ui_bindings.cc.
+constexpr size_t kLayoutTestMaxMessageChunkSize =
+    IPC::Channel::kMaximumMessageSize / 4;
 }  // namespace
 
 DevToolsProtocolTestBindings::DevToolsProtocolTestBindings(
@@ -109,7 +111,7 @@ void DevToolsProtocolTestBindings::HandleMessageFromTest(
 void DevToolsProtocolTestBindings::DispatchProtocolMessage(
     DevToolsAgentHost* agent_host,
     const std::string& message) {
-  if (message.length() < kMaxMessageChunkSize) {
+  if (message.length() < kLayoutTestMaxMessageChunkSize) {
     std::string param;
     base::EscapeJSONString(message, true, &param);
     std::string code = "DevToolsAPI.dispatchMessage(" + param + ");";
@@ -119,10 +121,11 @@ void DevToolsProtocolTestBindings::DispatchProtocolMessage(
   }
 
   size_t total_size = message.length();
-  for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
+  for (size_t pos = 0; pos < message.length();
+       pos += kLayoutTestMaxMessageChunkSize) {
     std::string param;
-    base::EscapeJSONString(message.substr(pos, kMaxMessageChunkSize), true,
-                           &param);
+    base::EscapeJSONString(message.substr(pos, kLayoutTestMaxMessageChunkSize),
+                           true, &param);
     std::string code = "DevToolsAPI.dispatchMessageChunk(" + param + "," +
                        std::to_string(pos ? 0 : total_size) + ");";
     base::string16 javascript = base::UTF8ToUTF16(code);

content/shell/browser/shell_devtools_bindings.cc

@@ -188,8 +188,10 @@ class ShellDevToolsBindings::NetworkResourceLoader
 };
 
 // This constant should be in sync with
-// the constant at devtools_ui_bindings.cc.
-const size_t kMaxMessageChunkSize = IPC::Channel::kMaximumMessageSize / 4;
+// the constant
+// kMaxMessageChunkSize in chrome/browser/devtools/devtools_ui_bindings.cc.
+constexpr size_t kShellMaxMessageChunkSize =
+    IPC::Channel::kMaximumMessageSize / 4;
 
 void ShellDevToolsBindings::InspectElementAt(int x, int y) {
   if (agent_host_) {
@@ -396,7 +398,7 @@ void ShellDevToolsBindings::HandleMessageFromDevToolsFrontend(
 void ShellDevToolsBindings::DispatchProtocolMessage(
     DevToolsAgentHost* agent_host,
     const std::string& message) {
-  if (message.length() < kMaxMessageChunkSize) {
+  if (message.length() < kShellMaxMessageChunkSize) {
     std::string param;
     base::EscapeJSONString(message, true, &param);
     std::string code = "DevToolsAPI.dispatchMessage(" + param + ");";
@@ -406,9 +408,10 @@ void ShellDevToolsBindings::DispatchProtocolMessage(
   }
 
   size_t total_size = message.length();
-  for (size_t pos = 0; pos < message.length(); pos += kMaxMessageChunkSize) {
+  for (size_t pos = 0; pos < message.length();
+       pos += kShellMaxMessageChunkSize) {
     std::string param;
-    base::EscapeJSONString(message.substr(pos, kMaxMessageChunkSize), true,
+    base::EscapeJSONString(message.substr(pos, kShellMaxMessageChunkSize), true,
                            &param);
     std::string code = "DevToolsAPI.dispatchMessageChunk(" + param + "," +
                        std::to_string(pos ? 0 : total_size) + ");";