Remove MOJO_SHELL_CLIENT define.

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"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm_shell.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/wm/core/coordinate_conversion.h"
 #endif
 
 #if defined(USE_AURA)
+#include "chrome/browser/ui/views/tabs/window_finder_mus.h"
+#include "content/public/common/mojo_shell_connection.h"
+#include "services/shell/runner/common/client_util.h"
 #include "ui/aura/env.h"
 #include "ui/aura/window.h"
 #include "ui/wm/core/window_modality_controller.h"
 #endif
 
-#if defined(MOJO_SHELL_CLIENT)
-#include "chrome/browser/ui/views/tabs/window_finder_mus.h"
-#include "content/public/common/mojo_shell_connection.h"
-#include "services/shell/runner/common/client_util.h"
-#endif
-
 using base::UserMetricsAction;
 using content::OpenURLParams;
 using content::WebContents;
 
 // If non-null there is a drag underway.
 static TabDragController* instance_ = NULL;
 
 namespace {
 
 // Delay, in ms, during dragging before we bring a window to front.
@@ skipping 151 matching lines @@
       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),
       weak_factory_(this) {
   instance_ = this;
 
-#if defined(MOJO_SHELL_CLIENT)
+#if defined(USE_AURA)
   content::MojoShellConnection* mojo_shell_connection =
       content::MojoShellConnection::GetForProcess();
   if (mojo_shell_connection && shell::ShellIsRemote())
     window_finder_.reset(new WindowFinderMus);
   else
 #endif
     window_finder_.reset(new WindowFinder);
 }
 
 TabDragController::~TabDragController() {
@@ skipping 1586 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;
 }