Revert of Query NaCl processes' GDB debug port on the correct thread.

chrome/browser/task_manager/sampling/task_group.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/task_manager/sampling/task_group.h"
 
 #include <algorithm>
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "build/build_config.h"
 #include "chrome/browser/task_manager/sampling/shared_sampler.h"
 #include "chrome/browser/task_manager/task_manager_observer.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/memory_coordinator.h"
 #include "content/public/common/content_features.h"
 #include "gpu/ipc/common/memory_stats.h"
 
 namespace task_manager {
 
 namespace {
 
 // A mask for the refresh types that are done in the background thread.
 const int kBackgroundRefreshTypesMask =
     REFRESH_TYPE_CPU | REFRESH_TYPE_MEMORY | REFRESH_TYPE_IDLE_WAKEUPS |
 #if defined(OS_WIN)
-        REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
+    REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
 #endif  // defined(OS_WIN)
 #if defined(OS_LINUX)
-        REFRESH_TYPE_FD_COUNT |
+    REFRESH_TYPE_FD_COUNT |
 #endif  // defined(OS_LINUX)
-        REFRESH_TYPE_NACL ||
     REFRESH_TYPE_PRIORITY;
 
 #if defined(OS_WIN)
 // Gets the GDI and USER Handles on Windows at one shot.
 void GetWindowsHandles(base::ProcessHandle handle,
                        int64_t* out_gdi_current,
                        int64_t* out_gdi_peak,
                        int64_t* out_user_current,
                        int64_t* out_user_peak) {
   *out_gdi_current = 0;
@@ skipping 125 matching lines @@
   }
 
   // 3- Refresh Windows handles (if enabled).
 #if defined(OS_WIN)
   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_HANDLES,
                                                     refresh_flags)) {
     RefreshWindowsHandles();
   }
 #endif  // defined(OS_WIN)
 
-// 4- Refresh the NACL debug stub port (if enabled). This calls out to
-//    NaClBrowser on the browser's IO thread, completing asynchronously.
+  // 4- Refresh the NACL debug stub port (if enabled).
 #if !defined(DISABLE_NACL)
   if (TaskManagerObserver::IsResourceRefreshEnabled(REFRESH_TYPE_NACL,
                                                     refresh_flags) &&
       !tasks_.empty()) {
     RefreshNaClDebugStubPort(tasks_[0]->GetChildProcessUniqueID());
   }
 #endif  // !defined(DISABLE_NACL)
 
   int64_t shared_refresh_flags =
       refresh_flags & shared_sampler_->GetSupportedFlags();
@@ skipping 58 matching lines @@
 void TaskGroup::RefreshWindowsHandles() {
 #if defined(OS_WIN)
   GetWindowsHandles(process_handle_,
                     &gdi_current_handles_,
                     &gdi_peak_handles_,
                     &user_current_handles_,
                     &user_peak_handles_);
 #endif  // defined(OS_WIN)
 }
 
+void TaskGroup::RefreshNaClDebugStubPort(int child_process_unique_id) {
 #if !defined(DISABLE_NACL)
-void TaskGroup::RefreshNaClDebugStubPort(int child_process_unique_id) {
   nacl::NaClBrowser* nacl_browser = nacl::NaClBrowser::GetInstance();
-  content::BrowserThread::PostTaskAndReplyWithResult(
-      content::BrowserThread::IO, FROM_HERE,
-      base::Bind(&nacl::NaClBrowser::GetProcessGdbDebugStubPort,
-                 base::Unretained(nacl_browser), child_process_unique_id),
-      base::Bind(&TaskGroup::OnRefreshNaClDebugStubPortDone,
-                 weak_ptr_factory_.GetWeakPtr()));
+  nacl_debug_stub_port_ =
+      nacl_browser->GetProcessGdbDebugStubPort(child_process_unique_id);
+#endif  // !defined(DISABLE_NACL)
 }
 
-void TaskGroup::OnRefreshNaClDebugStubPortDone(int nacl_debug_stub_port) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-
-  nacl_debug_stub_port_ = nacl_debug_stub_port;
-  OnBackgroundRefreshTypeFinished(REFRESH_TYPE_NACL);
-}
-#endif  // !defined(DISABLE_NACL)
-
 void TaskGroup::OnCpuRefreshDone(double cpu_usage) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   cpu_usage_ = cpu_usage;
   OnBackgroundRefreshTypeFinished(REFRESH_TYPE_CPU);
 }
 
 void TaskGroup::OnStartTimeRefreshDone(base::Time start_time) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
@@ skipping 55 matching lines @@
 
 void TaskGroup::OnBackgroundRefreshTypeFinished(int64_t finished_refresh_type) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
   current_on_bg_done_flags_ |= finished_refresh_type;
   if (AreBackgroundCalculationsDone())
     on_background_calculations_done_.Run();
 }
 
 }  // namespace task_manager