[fuchsia] Move test_devtools_list_fetcher to //fuchsia/base.

* These files were in //fuchsia/engine but are now needed for tests
  outside of WebEngine.
* Spin-off from https://crrev.com/c/1773707

Bug: 997895
Change-Id: I8361953162f9353fba8493a08ca984de0492b7f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1778917
Auto-Submit: Fabrice de Gans-Riberi <fdegans@chromium.org>
Commit-Queue: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Cr-Commit-Position: refs/heads/master@{#692279}

PRESUBMIT.py

@@ -1023,7 +1023,7 @@ _BANNED_CPP_FUNCTIONS = (
         r'.*_ios\.(cc|h)$',
         r'^net[\\/].*\.(cc|h)$',
         r'.*[\\/]tools[\\/].*\.(cc|h)$',
-        r'^fuchsia/engine/test_devtools_list_fetcher\.cc$',
+        r'^fuchsia/base/test_devtools_list_fetcher\.cc$',
       ),
     ),
     (

fuchsia/base/BUILD.gn

@@ -69,6 +69,8 @@ source_set("test_support") {
     "frame_test_util.cc",
     "frame_test_util.h",
     "result_receiver.h",
+    "test_devtools_list_fetcher.cc",
+    "test_devtools_list_fetcher.h",
     "test_navigation_listener.cc",
     "test_navigation_listener.h",
   ]
@@ -76,6 +78,8 @@ source_set("test_support") {
     ":base",
     ":modular",
     "//base",
+    "//net",
+    "//net:test_support",
     "//third_party/fuchsia-sdk/sdk:modular",
     "//third_party/fuchsia-sdk/sdk:web",
     "//url",

fuchsia/engine/test_devtools_list_fetcher.cc → fuchsia/base/test_devtools_list_fetcher.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/test_devtools_list_fetcher.h"
+#include "fuchsia/base/test_devtools_list_fetcher.h"
 
 #include "base/callback.h"
 #include "base/json/json_reader.h"
@@ -68,7 +68,11 @@ class DevToolsListFetcher : public net::URLFetcherDelegate {
 
 }  // namespace
 
+namespace cr_fuchsia {
+
 base::Value GetDevToolsListFromPort(uint16_t port) {
   DevToolsListFetcher devtools_fetcher;
   return devtools_fetcher.GetDevToolsListFromPort(port);
 }
+
+}  // namespace cr_fuchsia

fuchsia/engine/test_devtools_list_fetcher.h → fuchsia/base/test_devtools_list_fetcher.h

@@ -2,13 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_TEST_DEVTOOLS_LIST_FETCHER_H_
-#define FUCHSIA_ENGINE_TEST_DEVTOOLS_LIST_FETCHER_H_
+#ifndef FUCHSIA_BASE_TEST_DEVTOOLS_LIST_FETCHER_H_
+#define FUCHSIA_BASE_TEST_DEVTOOLS_LIST_FETCHER_H_
 
 #include "base/values.h"
 
+namespace cr_fuchsia {
+
 // Returns the JSON value of the list URL for the DevTools service listening
 // on port |port| on localhost. Returns an empty value on error.
 base::Value GetDevToolsListFromPort(uint16_t port);
 
-#endif  // FUCHSIA_ENGINE_TEST_DEVTOOLS_LIST_FETCHER_H_
+}  // namespace cr_fuchsia
+
+#endif  // FUCHSIA_BASE_TEST_DEVTOOLS_LIST_FETCHER_H_

fuchsia/engine/BUILD.gn

@@ -270,8 +270,6 @@ test("web_engine_integration_tests") {
   sources = [
     "test_debug_listener.cc",
     "test_debug_listener.h",
-    "test_devtools_list_fetcher.cc",
-    "test_devtools_list_fetcher.h",
     "web_engine_debug_integration_test.cc",
     "web_engine_integration_test.cc",
   ]
@@ -283,8 +281,6 @@ test("web_engine_integration_tests") {
     "//base/test:run_all_unittests",
     "//fuchsia/base",
     "//fuchsia/base:test_support",
-    "//net",
-    "//net:test_support",
     "//third_party/fuchsia-sdk/sdk:web",
   ]
   package_deps = [ [

fuchsia/engine/web_engine_debug_integration_test.cc

@@ -16,9 +16,9 @@
 #include "fuchsia/base/fit_adapter.h"
 #include "fuchsia/base/frame_test_util.h"
 #include "fuchsia/base/result_receiver.h"
+#include "fuchsia/base/test_devtools_list_fetcher.h"
 #include "fuchsia/base/test_navigation_listener.h"
 #include "fuchsia/engine/test_debug_listener.h"
-#include "fuchsia/engine/test_devtools_list_fetcher.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -156,8 +156,8 @@ TEST_F(WebEngineDebugIntegrationTest, DebugService) {
   // Test the debug information is correct.
   dev_tools_listener_.RunUntilNumberOfPortsIs(1u);
 
-  base::Value devtools_list =
-      GetDevToolsListFromPort(*dev_tools_listener_.debug_ports().begin());
+  base::Value devtools_list = cr_fuchsia::GetDevToolsListFromPort(
+      *dev_tools_listener_.debug_ports().begin());
   ASSERT_TRUE(devtools_list.is_list());
   EXPECT_EQ(devtools_list.GetList().size(), 1u);
 
@@ -184,7 +184,7 @@ TEST_F(WebEngineDebugIntegrationTest, MultipleDebugClients) {
   dev_tools_listener_.RunUntilNumberOfPortsIs(1u);
   uint16_t port1 = *dev_tools_listener_.debug_ports().begin();
 
-  base::Value devtools_list1 = GetDevToolsListFromPort(port1);
+  base::Value devtools_list1 = cr_fuchsia::GetDevToolsListFromPort(port1);
   ASSERT_TRUE(devtools_list1.is_list());
   EXPECT_EQ(devtools_list1.GetList().size(), 1u);
 
@@ -218,7 +218,7 @@ TEST_F(WebEngineDebugIntegrationTest, MultipleDebugClients) {
   ASSERT_NE(dev_tools_listener_.debug_ports().find(port2),
             dev_tools_listener_.debug_ports().end());
 
-  base::Value devtools_list2 = GetDevToolsListFromPort(port2);
+  base::Value devtools_list2 = cr_fuchsia::GetDevToolsListFromPort(port2);
   ASSERT_TRUE(devtools_list2.is_list());
   EXPECT_EQ(devtools_list2.GetList().size(), 1u);
 

fuchsia/engine/web_engine_integration_test.cc

@@ -17,8 +17,8 @@
 #include "fuchsia/base/fit_adapter.h"
 #include "fuchsia/base/frame_test_util.h"
 #include "fuchsia/base/result_receiver.h"
+#include "fuchsia/base/test_devtools_list_fetcher.h"
 #include "fuchsia/base/test_navigation_listener.h"
-#include "fuchsia/engine/test_devtools_list_fetcher.h"
 #include "net/http/http_request_headers.h"
 #include "net/test/embedded_test_server/default_handlers.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -254,7 +254,8 @@ TEST_F(WebEngineIntegrationTest, RemoteDebuggingPort) {
       nav_controller.get(), fuchsia::web::LoadUrlParams(), url.spec()));
   navigation_listener.RunUntilUrlEquals(url);
 
-  base::Value devtools_list = GetDevToolsListFromPort(remote_debugging_port);
+  base::Value devtools_list =
+      cr_fuchsia::GetDevToolsListFromPort(remote_debugging_port);
   ASSERT_TRUE(devtools_list.is_list());
   EXPECT_EQ(devtools_list.GetList().size(), 1u);