Remove ScopedVector from chrome/browser/.

chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc

 // Copyright 2013 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_icon_linux_wrapper.h"
 
+#include "base/memory/ptr_util.h"
 #include "ui/message_center/notifier_settings.h"
 #include "ui/views/linux_ui/linux_ui.h"
 
 StatusIconLinuxWrapper::StatusIconLinuxWrapper(
-    views::StatusIconLinux* status_icon)
-    : menu_model_(NULL) {
-  status_icon_.reset(status_icon);
+    std::unique_ptr<views::StatusIconLinux> status_icon)
+    : status_icon_(std::move(status_icon)), menu_model_(nullptr) {
   status_icon_->set_delegate(this);
 }
 
 StatusIconLinuxWrapper::~StatusIconLinuxWrapper() {
   if (menu_model_)
     menu_model_->RemoveObserver(this);
 }
 
 void StatusIconLinuxWrapper::SetImage(const gfx::ImageSkia& image) {
   status_icon_->SetImage(image);
@@ skipping 16 matching lines @@
 }
 
 bool StatusIconLinuxWrapper::HasClickAction() {
   return HasObservers();
 }
 
 void StatusIconLinuxWrapper::OnMenuStateChanged() {
   status_icon_->RefreshPlatformContextMenu();
 }
 
-StatusIconLinuxWrapper* StatusIconLinuxWrapper::CreateWrappedStatusIcon(
+std::unique_ptr<StatusIconLinuxWrapper>
+StatusIconLinuxWrapper::CreateWrappedStatusIcon(
     const gfx::ImageSkia& image,
     const base::string16& tool_tip) {
   const views::LinuxUI* linux_ui = views::LinuxUI::instance();
   if (linux_ui) {
-    std::unique_ptr<views::StatusIconLinux> status_icon =
-        linux_ui->CreateLinuxStatusIcon(image, tool_tip);
-    if (status_icon.get())
-      return new StatusIconLinuxWrapper(status_icon.release());
+    auto status_icon = linux_ui->CreateLinuxStatusIcon(image, tool_tip);
+    if (status_icon)

[Lei Zhang, 2017/03/23 02:59:26]

braces

[leonhsl(Using Gerrit), 2017/03/23 15:03:17]

Done.

+      return base::WrapUnique(
+          new StatusIconLinuxWrapper(std::move(status_icon)));
   }
-  return NULL;
+  return nullptr;
 }
 
 void StatusIconLinuxWrapper::UpdatePlatformContextMenu(
     StatusIconMenuModel* model) {
   // If a menu already exists, remove ourself from its oberver list.
   if (menu_model_)
     menu_model_->RemoveObserver(this);
 
   status_icon_->UpdatePlatformContextMenu(model);
   menu_model_ = model;
 
   if (model)
     model->AddObserver(this);
 }