Remove WebRtcTextLogHandler::LogInitialInfoOnFileThread().

Replace it with GetNetworkInterfaceList() which more accurately describe
what it does. Use base::PostTaskWithTraitsAndReplyWithResult() so it
does not need to know how to reply.

Change-Id: Ibc9f9cdec03cbc602903fc2342c9629ba79aa42d
Reviewed-on: https://chromium-review.googlesource.com/740945Reviewed-by: Xiaohan Wang <xhwang@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#513227}

chrome/browser/media/webrtc/webrtc_text_log_handler.cc

@@ -46,6 +46,7 @@ using base::IntToString;
 using content::BrowserThread;
 
 namespace {
+
 std::string FormatMetaDataAsLogMessage(const MetaDataMap& meta_data) {
   std::string message;
   for (auto& kv : meta_data) {
@@ -90,6 +91,14 @@ std::string IPAddressToSensitiveString(const net::IPAddress& address) {
   return address.ToString();
 #endif
 }
+
+net::NetworkInterfaceList GetNetworkInterfaceList() {
+  net::NetworkInterfaceList network_list;
+  net::GetNetworkList(&network_list,
+                      net::EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES);
+  return network_list;
+}
+
 }  // namespace
 
 WebRtcLogBuffer::WebRtcLogBuffer()
@@ -197,9 +206,10 @@ bool WebRtcTextLogHandler::StartLogging(WebRtcLogUploader* log_uploader,
   if (!meta_data_)
     meta_data_.reset(new MetaDataMap());
 
-  base::PostTaskWithTraits(
+  base::PostTaskWithTraitsAndReplyWithResult(
       FROM_HERE, {base::MayBlock(), base::TaskPriority::BACKGROUND},
-      base::BindOnce(&WebRtcTextLogHandler::LogInitialInfoOnFileThread, this,
+      base::BindOnce(&GetNetworkInterfaceList),
+      base::BindOnce(&WebRtcTextLogHandler::LogInitialInfoOnIOThread, this,
                      callback));
   return true;
 }
@@ -377,21 +387,9 @@ void WebRtcTextLogHandler::FireGenericDoneCallback(
       base::BindOnce(callback, success, error_message_with_state));
 }
 
-void WebRtcTextLogHandler::LogInitialInfoOnFileThread(
-    const GenericDoneCallback& callback) {
-  net::NetworkInterfaceList network_list;
-  net::GetNetworkList(&network_list,
-                      net::EXCLUDE_HOST_SCOPE_VIRTUAL_INTERFACES);
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      base::BindOnce(&WebRtcTextLogHandler::LogInitialInfoOnIOThread, this,
-                     network_list, callback));
-}
-
 void WebRtcTextLogHandler::LogInitialInfoOnIOThread(
-    const net::NetworkInterfaceList& network_list,
-    const GenericDoneCallback& callback) {
+    const GenericDoneCallback& callback,
+    const net::NetworkInterfaceList& network_list) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   if (logging_state_ != STARTING) {
     FireGenericDoneCallback(callback, false, "Logging cancelled.");

chrome/browser/media/webrtc/webrtc_text_log_handler.h

@@ -138,9 +138,8 @@ class WebRtcTextLogHandler
 
   void LogToCircularBuffer(const std::string& message);
 
-  void LogInitialInfoOnFileThread(const GenericDoneCallback& callback);
-  void LogInitialInfoOnIOThread(const net::NetworkInterfaceList& network_list,
-                                const GenericDoneCallback& callback);
+  void LogInitialInfoOnIOThread(const GenericDoneCallback& callback,
+                                const net::NetworkInterfaceList& network_list);
   void EnableBrowserProcessLoggingOnUIThread();
   void DisableBrowserProcessLoggingOnUIThread();