Refactor WindowFinder definition

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

 // Copyright (c) 2012 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/ui/views/tabs/tab_drag_controller.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
@@ skipping 31 matching lines @@
 #if defined(USE_ASH)
 #include "ash/common/accelerators/accelerator_commands.h"  // nogncheck
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"  // nogncheck
 #include "ash/common/wm/window_state.h"  // nogncheck
 #include "ash/common/wm_shell.h"  // nogncheck
 #include "ash/wm/window_state_aura.h"  // nogncheck
 #include "ui/wm/core/coordinate_conversion.h"  // nogncheck
 #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
 #endif
 
 using base::UserMetricsAction;
 using content::OpenURLParams;
 using content::WebContents;
@@ skipping 155 matching lines @@
       was_source_maximized_(false),
       was_source_fullscreen_(false),
       did_restore_window_(false),
       end_run_loop_behavior_(END_RUN_LOOP_STOP_DRAGGING),
       waiting_for_run_loop_to_exit_(false),
       tab_strip_to_attach_to_after_exit_(NULL),
       move_loop_widget_(NULL),
       is_mutating_(false),
       attach_x_(-1),
       attach_index_(-1),
+      window_finder_(new WindowFinder),
       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() {
   views::ViewStorage::GetInstance()->RemoveView(old_focused_view_id_);
 
   if (instance_ == this)
     instance_ = NULL;
 
   if (move_loop_widget_) {
     if (added_observer_to_move_loop_widget_)
@@ skipping 1597 matching lines @@
   // TODO(pkotwicz): Fix this properly (crbug.com/358482)
   for (auto* browser : *BrowserList::GetInstance()) {
     if (browser->tab_strip_model()->empty())
       exclude.insert(browser->window()->GetNativeWindow());
   }
 #endif
   base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr());
   *window = window_finder_->GetLocalProcessWindowAtPoint(screen_point, exclude);
   return ref ? Liveness::ALIVE : Liveness::DELETED;
 }