Remove ScopedVector from chrome/browser/.

chrome/browser/ui/views/status_icons/status_tray_win.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/status_icons/status_tray_win.h"
 
 #include <commctrl.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/views/status_icons/status_icon_win.h"
 #include "chrome/browser/ui/views/status_icons/status_tray_state_changer_win.h"
 #include "chrome/common/chrome_constants.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/geometry/point.h"
@@ skipping 130 matching lines @@
 }
 
 LRESULT CALLBACK StatusTrayWin::WndProc(HWND hwnd,
                                         UINT message,
                                         WPARAM wparam,
                                         LPARAM lparam) {
   if (message == taskbar_created_message_) {
     // We need to reset all of our icons because the taskbar went away.
     for (StatusIcons::const_iterator i(status_icons().begin());
          i != status_icons().end(); ++i) {
-      StatusIconWin* win_icon = static_cast<StatusIconWin*>(*i);
+      StatusIconWin* win_icon = static_cast<StatusIconWin*>(i->get());
       win_icon->ResetIcon();
     }
     return TRUE;
   } else if (message == kStatusIconMessage) {
-    StatusIconWin* win_icon = NULL;
+    StatusIconWin* win_icon = nullptr;
 
     // Find the selected status icon.
     for (StatusIcons::const_iterator i(status_icons().begin());
          i != status_icons().end();
          ++i) {
-      StatusIconWin* current_win_icon = static_cast<StatusIconWin*>(*i);
+      StatusIconWin* current_win_icon = static_cast<StatusIconWin*>(i->get());
       if (current_win_icon->icon_id() == wparam) {
         win_icon = current_win_icon;
         break;
       }
     }
 
     // It is possible for this procedure to be called with an obsolete icon
     // id.  In that case we should just return early before handling any
     // actions.
     if (!win_icon)
@@ skipping 16 matching lines @@
     }
   } else if (message == WM_ENDSESSION) {
     // If Chrome is in background-only mode, this is the only notification
     // it gets that Windows is exiting. Make sure we shutdown in an orderly
     // fashion.
     chrome::SessionEnding();
   }
   return ::DefWindowProc(hwnd, message, wparam, lparam);
 }
 
-StatusIcon* StatusTrayWin::CreatePlatformStatusIcon(
+std::unique_ptr<StatusIcon> StatusTrayWin::CreatePlatformStatusIcon(
     StatusTray::StatusIconType type,
     const gfx::ImageSkia& image,
     const base::string16& tool_tip) {
   UINT next_icon_id;
   if (type == StatusTray::OTHER_ICON)
     next_icon_id = NextIconId();
   else
     next_icon_id = ReservedIconId(type);
 
-  StatusIcon* icon =
-      new StatusIconWin(this, next_icon_id, window_, kStatusIconMessage);
+  auto icon = base::MakeUnique<StatusIconWin>(this, next_icon_id, window_,
+                                              kStatusIconMessage);
 
   icon->SetImage(image);
   icon->SetToolTip(tool_tip);
-  return icon;
+  return std::move(icon);
 }
 
 UINT StatusTrayWin::NextIconId() {
   UINT icon_id = next_icon_id_++;
   return kBaseIconId + static_cast<UINT>(NAMED_STATUS_ICON_COUNT) + icon_id;
 }
 
 void StatusTrayWin::SetStatusTrayStateChangerProxyForTest(
     std::unique_ptr<StatusTrayStateChangerProxy> proxy) {
   state_changer_proxy_ = std::move(proxy);
 }
 
 StatusTray* StatusTray::Create() {
   return new StatusTrayWin();
 }