| Index: android_webview/browser/aw_devtools_server.cc
|
| diff --git a/android_webview/native/aw_devtools_server.cc b/android_webview/browser/aw_devtools_server.cc
|
| similarity index 90%
|
| rename from android_webview/native/aw_devtools_server.cc
|
| rename to android_webview/browser/aw_devtools_server.cc
|
| index 9ced44b6430ac132c6cdea1f0550b2a2fdc4c18a..0348f3982ed83bc59c15c4c1789eeb4cf6e44a99 100644
|
| --- a/android_webview/native/aw_devtools_server.cc
|
| +++ b/android_webview/browser/aw_devtools_server.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "android_webview/native/aw_devtools_server.h"
|
| +#include "android_webview/browser/aw_devtools_server.h"
|
|
|
| #include <utility>
|
|
|
| +#include "android_webview/browser/aw_contents.h"
|
| #include "android_webview/browser/browser_view_renderer.h"
|
| #include "android_webview/common/aw_content_client.h"
|
| -#include "android_webview/native/aw_contents.h"
|
| #include "base/bind.h"
|
| #include "base/files/file_path.h"
|
| #include "base/json/json_writer.h"
|
| @@ -41,9 +41,7 @@ const int kBackLog = 10;
|
| class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory {
|
| public:
|
| explicit UnixDomainServerSocketFactory(const std::string& socket_name)
|
| - : socket_name_(socket_name),
|
| - last_tethering_socket_(0) {
|
| - }
|
| + : socket_name_(socket_name), last_tethering_socket_(0) {}
|
|
|
| private:
|
| // content::DevToolsAgentHost::ServerSocketFactory.
|
| @@ -60,8 +58,8 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory {
|
|
|
| std::unique_ptr<net::ServerSocket> CreateForTethering(
|
| std::string* name) override {
|
| - *name = base::StringPrintf(
|
| - kTetheringSocketName, getpid(), ++last_tethering_socket_);
|
| + *name = base::StringPrintf(kTetheringSocketName, getpid(),
|
| + ++last_tethering_socket_);
|
| std::unique_ptr<net::UnixDomainServerSocket> socket(
|
| new net::UnixDomainServerSocket(
|
| base::Bind(&content::CanUserConnectToDevTools),
|
| @@ -82,8 +80,7 @@ class UnixDomainServerSocketFactory : public content::DevToolsSocketFactory {
|
|
|
| namespace android_webview {
|
|
|
| -AwDevToolsServer::AwDevToolsServer() : is_started_(false) {
|
| -}
|
| +AwDevToolsServer::AwDevToolsServer() : is_started_(false) {}
|
|
|
| AwDevToolsServer::~AwDevToolsServer() {
|
| Stop();
|
| @@ -100,8 +97,7 @@ void AwDevToolsServer::Start() {
|
| DevToolsAgentHost::StartRemoteDebuggingServer(
|
| std::move(factory),
|
| base::StringPrintf(kFrontEndURL, content::GetWebKitRevision().c_str()),
|
| - base::FilePath(), base::FilePath(),
|
| - GetProduct(), GetUserAgent());
|
| + base::FilePath(), base::FilePath(), GetProduct(), GetUserAgent());
|
| }
|
|
|
| void AwDevToolsServer::Stop() {
|
|
|