Refactor WindowFinder definition

chrome/browser/ui/views/tabs/tab_drag_controller.cc

Index: chrome/browser/ui/views/tabs/tab_drag_controller.cc
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index 1e6e2d4fe0f46fa0f9f249a9948dddc34bc9215b..14ed03e1c16ba0ccf55f5a71dacd0c27e691b363 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -49,9 +49,6 @@
 #endif
 
 #if defined(USE_AURA)
-#include "chrome/browser/ui/views/tabs/window_finder_mus.h"  // nogncheck
-#include "content/public/common/service_manager_connection.h"  // nogncheck
-#include "services/service_manager/runner/common/client_util.h"  // nogncheck
 #include "ui/aura/env.h"  // nogncheck
 #include "ui/aura/window.h"  // nogncheck
 #include "ui/wm/core/window_modality_controller.h"  // nogncheck
@@ -225,17 +222,9 @@ TabDragController::TabDragController()
       is_mutating_(false),
       attach_x_(-1),
       attach_index_(-1),
+      window_finder_(new WindowFinder),

[sky, 2016/10/31 22:43:45]

Use MakeUnique (see threads on chromium-dev).

[tonikitoo, 2016/10/31 23:39:36]

Done.

       weak_factory_(this) {
   instance_ = this;
-
-#if defined(USE_AURA)
-  content::ServiceManagerConnection* service_manager_connection =
-      content::ServiceManagerConnection::GetForProcess();
-  if (service_manager_connection && service_manager::ServiceManagerIsRemote())
-    window_finder_.reset(new WindowFinderMus);
-  else
-#endif
-    window_finder_.reset(new WindowFinder);
 }
 
 TabDragController::~TabDragController() {