Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

chrome/browser/ui/ash/system_tray_delegate_chromeos.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/ash/system_tray_delegate_chromeos.h"
 
 #include <stddef.h>
+
 #include <algorithm>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/metrics/user_metrics_recorder.h"
 #include "ash/session/session_state_delegate.h"
@@ skipping 12 matching lines @@
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/system/tray_accessibility.h"
 #include "ash/system/user/login_status.h"
 #include "ash/system/user/update_observer.h"
 #include "ash/system/user/user_observer.h"
 #include "ash/volume_control_delegate.h"
 #include "ash/wm/lock_state_controller.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/logging.h"
+#include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/sys_info.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h"
@@ skipping 110 matching lines @@
 }
 
 void BluetoothSetDiscoveringError() {
   LOG(ERROR) << "BluetoothSetDiscovering failed.";
 }
 
 void BluetoothDeviceConnectError(
     device::BluetoothDevice::ConnectErrorCode error_code) {
 }
 
-scoped_ptr<ash::CastConfigDelegate> CreateCastConfigDelegate() {
+std::unique_ptr<ash::CastConfigDelegate> CreateCastConfigDelegate() {
   if (CastConfigDelegateMediaRouter::IsEnabled())
-    return make_scoped_ptr(new CastConfigDelegateMediaRouter());
-  return make_scoped_ptr(new CastConfigDelegateChromeos());
+    return base::WrapUnique(new CastConfigDelegateMediaRouter());
+  return base::WrapUnique(new CastConfigDelegateChromeos());
 }
 
 void ShowSettingsSubPageForActiveUser(const std::string& sub_page) {
   chrome::ShowSettingsSubPageForProfile(
       ProfileManager::GetActiveUserProfile(), sub_page);
 }
 
 void OnAcceptMultiprofilesIntro(bool no_show_again) {
   PrefService* prefs = ProfileManager::GetActiveUserProfile()->GetPrefs();
   prefs->SetBoolean(prefs::kMultiProfileNeverShowIntro, no_show_again);
@@ skipping 508 matching lines @@
   input_method::InputMethodDescriptor ime =
       manager->GetActiveIMEState()->GetCurrentInputMethod();
   ExtractIMEInfo(ime, *util, info);
   info->selected = true;
 }
 
 void SystemTrayDelegateChromeOS::GetAvailableIMEList(ash::IMEInfoList* list) {
   input_method::InputMethodManager* manager =
       input_method::InputMethodManager::Get();
   input_method::InputMethodUtil* util = manager->GetInputMethodUtil();
-  scoped_ptr<input_method::InputMethodDescriptors> ime_descriptors(
+  std::unique_ptr<input_method::InputMethodDescriptors> ime_descriptors(
       manager->GetActiveIMEState()->GetActiveInputMethods());
   std::string current =
       manager->GetActiveIMEState()->GetCurrentInputMethod().id();
   for (size_t i = 0; i < ime_descriptors->size(); i++) {
     input_method::InputMethodDescriptor& ime = ime_descriptors->at(i);
     ash::IMEInfo info;
     ExtractIMEInfo(ime, *util, &info);
     info.selected = ime.id() == current;
     list->push_back(info);
   }
@@ skipping 76 matching lines @@
 SystemTrayDelegateChromeOS::GetNetworkingConfigDelegate() const {
   return networking_config_delegate_.get();
 }
 
 ash::VolumeControlDelegate*
 SystemTrayDelegateChromeOS::GetVolumeControlDelegate() const {
   return volume_control_delegate_.get();
 }
 
 void SystemTrayDelegateChromeOS::SetVolumeControlDelegate(
-    scoped_ptr<ash::VolumeControlDelegate> delegate) {
+    std::unique_ptr<ash::VolumeControlDelegate> delegate) {
   volume_control_delegate_.swap(delegate);
 }
 
 bool SystemTrayDelegateChromeOS::GetSessionStartTime(
     base::TimeTicks* session_start_time) {
   *session_start_time = session_start_time_;
   return have_session_start_time_;
 }
 
 bool SystemTrayDelegateChromeOS::GetSessionLengthLimit(
@@ skipping 396 matching lines @@
   GetSystemTrayNotifier()->NotifyRefreshBluetooth();
 }
 
 void SystemTrayDelegateChromeOS::DeviceRemoved(
     device::BluetoothAdapter* adapter,
     device::BluetoothDevice* device) {
   GetSystemTrayNotifier()->NotifyRefreshBluetooth();
 }
 
 void SystemTrayDelegateChromeOS::OnStartBluetoothDiscoverySession(
-    scoped_ptr<device::BluetoothDiscoverySession> discovery_session) {
+    std::unique_ptr<device::BluetoothDiscoverySession> discovery_session) {
   // If the discovery session was returned after a request to stop discovery
   // (e.g. the user dismissed the Bluetooth detailed view before the call
   // returned), don't claim the discovery session and let it clean up.
   if (!should_run_bluetooth_discovery_)
     return;
   VLOG(1) << "Claiming new Bluetooth device discovery session.";
   bluetooth_discovery_session_ = std::move(discovery_session);
   GetSystemTrayNotifier()->NotifyBluetoothDiscoveringChanged();
 }
 
@@ skipping 102 matching lines @@
   LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while "
                << "ENABLE_SUPERVISED_USERS undefined.";
   return base::string16();
 }
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate() {
   return new SystemTrayDelegateChromeOS();
 }
 
 }  // namespace chromeos