| Index: content/browser/devtools/devtools_http_handler_impl.cc
|
| diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
|
| index 1d0fca1e2824f007b7d5856b5be6e696d113b25c..1bb5f1bbfecd31ec3dd1af32e522123bc407ba24 100644
|
| --- a/content/browser/devtools/devtools_http_handler_impl.cc
|
| +++ b/content/browser/devtools/devtools_http_handler_impl.cc
|
| @@ -31,14 +31,13 @@
|
| #include "content/public/browser/devtools_target.h"
|
| #include "content/public/common/content_client.h"
|
| #include "content/public/common/url_constants.h"
|
| +#include "content/public/common/user_agent.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"
|
| #include "net/server/http_server_response_info.h"
|
| -#include "webkit/common/user_agent/user_agent.h"
|
| -#include "webkit/common/user_agent/user_agent_util.h"
|
|
|
| #if defined(OS_ANDROID)
|
| #include "base/android/build_info.h"
|
| @@ -453,10 +452,9 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI(
|
| if (command == "version") {
|
| base::DictionaryValue version;
|
| version.SetString("Protocol-Version", kProtocolVersion);
|
| - version.SetString("WebKit-Version", webkit_glue::GetWebKitVersion());
|
| - version.SetString("Browser", content::GetContentClient()->GetProduct());
|
| - version.SetString("User-Agent",
|
| - webkit_glue::GetUserAgent(GURL(kAboutBlankURL)));
|
| + version.SetString("WebKit-Version", GetWebKitVersion());
|
| + version.SetString("Browser", GetContentClient()->GetProduct());
|
| + version.SetString("User-Agent", GetUserAgent(GURL(kAboutBlankURL)));
|
| #if defined(OS_ANDROID)
|
| version.SetString("Android-Package",
|
| base::android::BuildInfo::GetInstance()->package_name());
|
|
|