DevTools: Move EscapeForHTML call from DevToolsTarget implementations to the client code

TBR=pfeldman,bulach,mnaganov
BUG=None

Review URL: https://codereview.chromium.org/36303006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230409 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 8 insertions, 10 deletions

diff --git a/android_webview/native/aw_dev_tools_server.cc b/android_webview/native/aw_dev_tools_server.cc
index 9903378..dd9879d 100644
--- a/android_webview/native/aw_dev_tools_server.cc
+++ b/android_webview/native/aw_dev_tools_server.cc
@@ -17,7 +17,6 @@
 #include "content/public/browser/devtools_target.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/AwDevToolsServer_jni.h"
-#include "net/base/escape.h"
 #include "net/socket/unix_domain_socket_posix.h"
 #include "webkit/common/user_agent/user_agent_util.h"
 
@@ -71,7 +70,7 @@ Target::Target(WebContents* web_contents) {
       DevToolsAgentHost::GetOrCreateFor(web_contents->GetRenderViewHost());
   id_ = agent_host_->GetId();
   description_ = GetViewDescription(web_contents);
-  title_ = UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle()));
+  title_ = UTF16ToUTF8(web_contents->GetTitle());
   url_ = web_contents->GetURL();
   last_activity_time_ = web_contents->GetLastSelectedTime();
 }
diff --git a/chrome/browser/android/dev_tools_server.cc b/chrome/browser/android/dev_tools_server.cc
index 87014f8..49a3b79 100644
--- a/chrome/browser/android/dev_tools_server.cc
+++ b/chrome/browser/android/dev_tools_server.cc
@@ -37,7 +37,6 @@
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
 #include "jni/DevToolsServer_jni.h"
-#include "net/base/escape.h"
 #include "net/socket/unix_domain_socket_posix.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -91,7 +90,7 @@ Target::Target(WebContents* web_contents) {
   agent_host_ =
       DevToolsAgentHost::GetOrCreateFor(web_contents->GetRenderViewHost());
   id_ = agent_host_->GetId();
-  title_ = UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle()));
+  title_ = UTF16ToUTF8(web_contents->GetTitle());
   url_ = web_contents->GetURL();
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
index 28de085..f464fa4d 100644
--- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc
+++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc
@@ -30,7 +30,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_discovery_page_resources.h"
-#include "net/base/escape.h"
 #include "net/socket/tcp_listen_socket.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -101,7 +100,7 @@ Target::Target(WebContents* web_contents, bool is_tab) {
   id_ = agent_host_->GetId();
   type_ = is_tab ? kTargetTypePage : kTargetTypeOther;
   description_ = GetExtensionName(web_contents);
-  title_ = UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle()));
+  title_ = UTF16ToUTF8(web_contents->GetTitle());
   url_ = web_contents->GetURL();
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();
@@ -163,7 +162,7 @@ WorkerTarget::WorkerTarget(const content::WorkerService::WorkerInfo& worker) {
   agent_host_ =
       DevToolsAgentHost::GetForWorker(worker.process_id, worker.route_id);
   id_ = agent_host_->GetId();
-  title_ = UTF16ToUTF8(net::EscapeForHTML(worker.name));
+  title_ = UTF16ToUTF8(worker.name);
   description_ =
       base::StringPrintf("Worker pid:%d", base::GetProcId(worker.handle));
   url_ = worker.url;
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index f56ea6b..bdea96f 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -32,6 +32,7 @@
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
 #include "grit/devtools_resources_map.h"
+#include "net/base/escape.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/server/http_server_request_info.h"
@@ -738,7 +739,8 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializeTarget(
   std::string id = target.GetId();
   dictionary->SetString(kTargetIdField, id);
   dictionary->SetString(kTargetTypeField, target.GetType());
-  dictionary->SetString(kTargetTitleField, target.GetTitle());
+  dictionary->SetString(kTargetTitleField,
+                        net::EscapeForHTML(target.GetTitle()));
   dictionary->SetString(kTargetDescriptionField, target.GetDescription());
 
   GURL url = target.GetUrl();
diff --git a/content/shell/browser/shell_devtools_delegate.cc b/content/shell/browser/shell_devtools_delegate.cc
index 8e05bc3..801ca42 100644
--- a/content/shell/browser/shell_devtools_delegate.cc
+++ b/content/shell/browser/shell_devtools_delegate.cc
@@ -21,7 +21,6 @@
 #include "content/public/common/url_constants.h"
 #include "content/shell/browser/shell.h"
 #include "grit/shell_resources.h"
-#include "net/base/escape.h"
 #include "net/socket/tcp_listen_socket.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ -102,7 +101,7 @@ Target::Target(WebContents* web_contents) {
   agent_host_ =
       DevToolsAgentHost::GetOrCreateFor(web_contents->GetRenderViewHost());
   id_ = agent_host_->GetId();
-  title_ = UTF16ToUTF8(net::EscapeForHTML(web_contents->GetTitle()));
+  title_ = UTF16ToUTF8(web_contents->GetTitle());
   url_ = web_contents->GetURL();
   content::NavigationController& controller = web_contents->GetController();
   content::NavigationEntry* entry = controller.GetActiveEntry();