Convert network.mojom.LoggingSettings to use handle<platform>

Bug: 710376
Change-Id: I78027a4bb288f9136de105c76df364cf24c70087
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2053254Reviewed-by: Tom Sepez <tsepez@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Commit-Queue: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#741537}

chrome/browser/chromeos/logging.cc

@@ -17,7 +17,6 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/network_service_instance.h"
 #include "content/public/common/network_service_util.h"
-#include "mojo/public/cpp/system/platform_handle.h"
 #include "services/network/public/mojom/network_service.mojom.h"
 
 namespace logging {
@@ -53,13 +52,13 @@ void SymlinkSetUp(const base::CommandLine& command_line,
   if (content::IsOutOfProcessNetworkService()) {
     auto logging_settings = network::mojom::LoggingSettings::New();
     logging_settings->logging_dest = settings.logging_dest;
-    const int log_file_descriptor = fileno(logging::DuplicateLogFILE());
-    if (log_file_descriptor < 0) {
+    base::ScopedFD log_file_descriptor(fileno(logging::DuplicateLogFILE()));
+    if (log_file_descriptor.get() < 0) {
       DLOG(WARNING) << "Unable to duplicate log file handle";
       return;
     }
     logging_settings->log_file_descriptor =
-        mojo::WrapPlatformFile(log_file_descriptor);
+        mojo::PlatformHandle(std::move(log_file_descriptor));
     content::GetNetworkService()->ReinitializeLogging(
         std::move(logging_settings));
   }

services/network/network_service.cc

@@ -74,10 +74,6 @@
 #include "net/android/http_auth_negotiate_android.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "mojo/public/cpp/system/platform_handle.h"
-#endif
-
 namespace network {
 
 namespace {
@@ -414,14 +410,8 @@ void NetworkService::DeregisterNetworkContext(NetworkContext* network_context) {
 void NetworkService::ReinitializeLogging(mojom::LoggingSettingsPtr settings) {
   logging::LoggingSettings logging_settings;
   logging_settings.logging_dest = settings->logging_dest;
-  int log_file_descriptor = -1;
-  if (mojo::UnwrapPlatformFile(std::move(settings->log_file_descriptor),
-                               &log_file_descriptor) != MOJO_RESULT_OK ||
-      log_file_descriptor < 0) {
-    LOG(ERROR) << "Failed to read new log file handle";
-    return;
-  }
-  logging_settings.log_file = fdopen(log_file_descriptor, "a");
+  base::ScopedFD log_file_descriptor = settings->log_file_descriptor.TakeFD();
+  logging_settings.log_file = fdopen(log_file_descriptor.release(), "a");
   if (!logging_settings.log_file) {
     LOG(ERROR) << "Failed to open new log file handle";
     return;

services/network/public/mojom/network_service.mojom

@@ -161,7 +161,7 @@ struct NetworkServiceParams {
 [EnableIf=is_chromeos]
 struct LoggingSettings {
   uint32 logging_dest;
-  handle log_file_descriptor;
+  handle<platform> log_file_descriptor;
 };
 
 // Browser interface to the network service.