Remove ScopedVector from chrome/browser/.

chrome/browser/status_icons/status_tray.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/status_icons/status_tray.h"
 
-#include <algorithm>
-
 #include "chrome/browser/status_icons/status_icon.h"
 
 StatusTray::~StatusTray() {
 }
 
 StatusIcon* StatusTray::CreateStatusIcon(StatusIconType type,
                                          const gfx::ImageSkia& image,
                                          const base::string16& tool_tip) {
-  StatusIcon* icon = CreatePlatformStatusIcon(type, image, tool_tip);
-  if (icon)
-    status_icons_.push_back(icon);
-  return icon;
+  auto icon = CreatePlatformStatusIcon(type, image, tool_tip);
+  if (!icon)
+    return nullptr;
+
+  status_icons_.push_back(std::move(icon));
+  return status_icons_.back().get();
 }
 
 void StatusTray::RemoveStatusIcon(StatusIcon* icon) {
-  StatusIcons::iterator i(
-      std::find(status_icons_.begin(), status_icons_.end(), icon));
-
-  if (i == status_icons_.end()) {
-    NOTREACHED();
-    return;
+  for (auto iter = status_icons_.begin(); iter != status_icons_.end(); ++iter) {
+    if (iter->get() == icon) {
+      status_icons_.erase(iter);
+      return;
+    }
   }
-
-  status_icons_.erase(i);
+  NOTREACHED();
 }
 
 StatusTray::StatusTray() {
 }