Open Screen platform cleanup

This patch includes a lot of namespace moves and general name cleanup
for the Open Screen platform code.

Change-Id: I00b12810dd2828fe178d48f21032f25be6e5030c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1867450
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Auto-Submit: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>
Reviewed-by: mark a. foltz <mfoltz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#708003}

chrome/browser/media/router/BUILD.gn

@@ -154,11 +154,11 @@ static_library("router") {
         "providers/openscreen/network_service_quic_packet_writer.h",
         "providers/openscreen/platform/chrome_platform_client.cc",
         "providers/openscreen/platform/chrome_platform_client.h",
+        "providers/openscreen/platform/chrome_task_runner.cc",
+        "providers/openscreen/platform/chrome_task_runner.h",
         "providers/openscreen/platform/chrome_udp_socket.cc",
         "providers/openscreen/platform/chrome_udp_socket.h",
         "providers/openscreen/platform/logging.cc",
-        "providers/openscreen/platform/task_runner.cc",
-        "providers/openscreen/platform/task_runner.h",
         "providers/openscreen/platform/time.cc",
         "providers/openscreen/platform/trace_logging_platform.cc",
       ]

chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.cc

@@ -11,6 +11,7 @@
 #include "net/traffic_annotation/network_traffic_annotation.h"
 
 namespace media_router {
+
 NetworkServiceAsyncPacketSender::NetworkServiceAsyncPacketSender(
     network::mojom::NetworkContext* network_context) {
   network_context->CreateUDPSocket(socket_.BindNewPipeAndPassReceiver(),

chrome/browser/media/router/providers/openscreen/network_service_async_packet_sender.h

@@ -15,6 +15,7 @@
 #include "services/network/public/mojom/udp_socket.mojom.h"
 
 namespace media_router {
+
 class AsyncPacketSender {
  public:
   virtual ~AsyncPacketSender() {}

chrome/browser/media/router/providers/openscreen/network_service_quic_packet_writer_unittest.cc

@@ -14,6 +14,7 @@
 #include "net/base/net_errors.h"
 
 namespace media_router {
+
 using ::testing::_;
 using ::testing::Invoke;
 using ::testing::Return;
@@ -267,4 +268,5 @@ TEST(NetworkServiceQuicPacketWriterTest, TooManyPacketsCausesWriteBlockage) {
 
   ASSERT_FALSE(test_writer.writer->IsWriteBlocked());
 }
+
 }  // namespace media_router

chrome/browser/media/router/providers/openscreen/platform/chrome_platform_client.cc

@@ -4,13 +4,11 @@
 
 #include "chrome/browser/media/router/providers/openscreen/platform/chrome_platform_client.h"
 
-#include <mutex>
+#include <utility>
 
 namespace media_router {
 
-ChromePlatformClient::~ChromePlatformClient() {
-  // TODO(jophba, rwkeane): Handle threads and safely shutting down singletons.
-}
+ChromePlatformClient::~ChromePlatformClient() = default;
 
 // static
 void ChromePlatformClient::Create(
@@ -38,7 +36,6 @@ ChromePlatformClient::ChromePlatformClient(
     std::unique_ptr<network::mojom::NetworkContext> network_context,
     scoped_refptr<base::SequencedTaskRunner> task_runner)
     : network_context_(std::move(network_context)),
-      task_runner_(
-          new openscreen::platform::ChromeTaskRunner(std::move(task_runner))) {}
+      task_runner_(new ChromeTaskRunner(std::move(task_runner))) {}
 
 }  // namespace media_router

chrome/browser/media/router/providers/openscreen/platform/chrome_platform_client.h

@@ -7,7 +7,7 @@
 
 #include <memory>
 
-#include "chrome/browser/media/router/providers/openscreen/platform/task_runner.h"
+#include "chrome/browser/media/router/providers/openscreen/platform/chrome_task_runner.h"
 #include "services/network/public/mojom/network_context.mojom.h"
 #include "third_party/openscreen/src/platform/api/platform_client.h"
 
@@ -39,7 +39,7 @@ class ChromePlatformClient : public openscreen::platform::PlatformClient {
       scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   const std::unique_ptr<network::mojom::NetworkContext> network_context_;
-  const std::unique_ptr<openscreen::platform::ChromeTaskRunner> task_runner_;
+  const std::unique_ptr<ChromeTaskRunner> task_runner_;
 };
 
 }  // namespace media_router

chrome/browser/media/router/providers/openscreen/platform/task_runner.cc → chrome/browser/media/router/providers/openscreen/platform/chrome_task_runner.cc

@@ -11,10 +11,12 @@
 #include "base/task/task_traits.h"
 #include "base/time/time.h"
 
-#include "chrome/browser/media/router/providers/openscreen/platform/task_runner.h"
+#include "chrome/browser/media/router/providers/openscreen/platform/chrome_task_runner.h"
 
-namespace openscreen {
-namespace platform {
+namespace media_router {
+
+using openscreen::platform::Clock;
+using openscreen::platform::TaskRunner;
 
 namespace {
 void ExecuteTask(TaskRunner::Task task) {
@@ -42,5 +44,4 @@ void ChromeTaskRunner::PostPackagedTaskWithDelay(TaskRunner::Task task,
       FROM_HERE, base::BindOnce(ExecuteTask, std::move(task)), time_delta);
 }
 
-}  // namespace platform
-}  // namespace openscreen
+}  // namespace media_router

chrome/browser/media/router/providers/openscreen/platform/task_runner.h → chrome/browser/media/router/providers/openscreen/platform/chrome_task_runner.h

@@ -2,16 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_TASK_RUNNER_H_
-#define CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_TASK_RUNNER_H_
+#ifndef CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_CHROME_TASK_RUNNER_H_
+#define CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_CHROME_TASK_RUNNER_H_
 
 #include "base/single_thread_task_runner.h"
 #include "third_party/openscreen/src/platform/api/task_runner.h"
 
-namespace openscreen {
-namespace platform {
+namespace media_router {
 
-class ChromeTaskRunner final : public TaskRunner {
+class ChromeTaskRunner final : public openscreen::platform::TaskRunner {
  public:
   explicit ChromeTaskRunner(
       scoped_refptr<base::SequencedTaskRunner> task_runner);
@@ -23,15 +22,15 @@ class ChromeTaskRunner final : public TaskRunner {
 
   // TaskRunner overrides
   ~ChromeTaskRunner() final;
-  void PostPackagedTask(TaskRunner::Task task) final;
-  void PostPackagedTaskWithDelay(TaskRunner::Task task,
-                                 Clock::duration delay) final;
+  void PostPackagedTask(openscreen::platform::TaskRunner::Task task) final;
+  void PostPackagedTaskWithDelay(
+      openscreen::platform::TaskRunner::Task task,
+      openscreen::platform::Clock::duration delay) final;
 
  private:
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 };
 
-}  // namespace platform
-}  // namespace openscreen
+}  // namespace media_router
 
-#endif  // CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_TASK_RUNNER_H_
+#endif  // CHROME_BROWSER_MEDIA_ROUTER_PROVIDERS_OPENSCREEN_PLATFORM_CHROME_TASK_RUNNER_H_