mus ws: Move 'reset(new' to base::MakeUnique.

services/ui/ws/focus_controller.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 "services/ui/ws/focus_controller.h"
 
 #include "base/macros.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "services/ui/ws/focus_controller_delegate.h"
 #include "services/ui/ws/focus_controller_observer.h"
@@ skipping 122 matching lines @@
 
 void FocusController::SetActiveWindow(ServerWindow* window,
                                       ActivationChangeReason reason) {
   DCHECK(!window || CanBeActivated(window));
   if (active_window_ == window)
     return;
   if (reason != ActivationChangeReason::CYCLE) {
     cycle_windows_.reset();
   } else if (activation_reason_ != ActivationChangeReason::CYCLE) {
     DCHECK(!cycle_windows_);
-    cycle_windows_.reset(new ServerWindowTracker());
+    cycle_windows_ = base::MakeUnique<ServerWindowTracker>();
     if (active_window_)
       cycle_windows_->Add(active_window_);
   }
 
   ServerWindow* old_active = active_window_;
   active_window_ = window;
   activation_reason_ = reason;
   FOR_EACH_OBSERVER(FocusControllerObserver, observers_,
                     OnActivationChanged(old_active, active_window_));
   if (active_window_ && activation_reason_ == ActivationChangeReason::CYCLE)
@@ skipping 74 matching lines @@
 
   focused_window_ = window;
   // We can currently use only a single ServerWindowDrawnTracker since focused
   // window is expected to be a direct descendant of the active window.
   if (focused_window_ && active_window_) {
     DCHECK(active_window_->Contains(focused_window_));
   }
   ServerWindow* track_window = focused_window_;
   if (!track_window)
     track_window = active_window_;
-  if (track_window)
-    drawn_tracker_.reset(new ServerWindowDrawnTracker(track_window, this));
-  else
+  if (track_window) {
+    drawn_tracker_ =
+        base::MakeUnique<ServerWindowDrawnTracker>(track_window, this);
+  } else {
     drawn_tracker_.reset();
+  }
   return true;
 }
 
 void FocusController::OnDrawnStateWillChange(ServerWindow* ancestor,
                                              ServerWindow* window,
                                              bool is_drawn) {
   DCHECK(!is_drawn);
   DCHECK_NE(ancestor, window);
   DCHECK(root_->Contains(window));
   drawn_tracker_.reset();
@@ skipping 50 matching lines @@
 }
 
 void FocusController::OnDrawnStateChanged(ServerWindow* ancestor,
                                           ServerWindow* window,
                                           bool is_drawn) {
   // DCHECK(false);  TODO(sadrul):
 }
 
 }  // namespace ws
 }  // namespace ui