Convert a few components from scoped_ptr to std::unique_ptr

components/storage_monitor/storage_monitor.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_H_
 #define COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_H_
 
 #include <map>
+#include <memory>
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/strings/string16.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_checker.h"
 #include "build/build_config.h"
 #include "components/storage_monitor/storage_info.h"
 
 class MediaFileSystemRegistryTest;
 class MediaGalleriesPlatformAppBrowserTest;
 class SystemStorageApiTest;
@@ skipping 51 matching lines @@
   // Destroys the StorageMonitor singleton.
   static void Destroy();
 
   // Returns a pointer to an object owned by BrowserProcess, with lifetime
   // starting before main message loop start, and ending after main message loop
   // shutdown. Called outside it's lifetime (or with no browser process),
   // returns NULL.
   static StorageMonitor* GetInstance();
 
   static void SetStorageMonitorForTesting(
-      scoped_ptr<StorageMonitor> storage_monitor);
+      std::unique_ptr<StorageMonitor> storage_monitor);
 
   virtual ~StorageMonitor();
 
   // Ensures that the storage monitor is initialized. The provided callback, if
   // non-null, will be called when initialization is complete. If initialization
   // has already completed, this callback will be invoked within the calling
   // stack. Before the callback is run, calls to |GetAllAvailableStorages| and
   // |GetStorageInfoForPath| may not return the correct results. In addition,
   // registered observers will not be notified on device attachment/detachment.
   // Should be invoked on the UI thread; callbacks will be run on the UI thread.
@@ skipping 65 matching lines @@
 
   class ReceiverImpl;
   friend class ReceiverImpl;
 
   // Key: device id.
   typedef std::map<std::string, StorageInfo> StorageMap;
 
   void ProcessAttach(const StorageInfo& storage);
   void ProcessDetach(const std::string& id);
 
-  scoped_ptr<Receiver> receiver_;
+  std::unique_ptr<Receiver> receiver_;
 
   scoped_refptr<base::ObserverListThreadSafe<RemovableStorageObserver>>
       observer_list_;
 
   // Used to make sure we call initialize from the same thread as creation.
   base::ThreadChecker thread_checker_;
 
   bool initializing_;
   bool initialized_;
   std::vector<base::Closure> on_initialize_callbacks_;
 
   // For manipulating storage_map_ structure.
   mutable base::Lock storage_lock_;
 
   // Map of all known storage devices,including fixed and removable storages.
   StorageMap storage_map_;
 
-  scoped_ptr<TransientDeviceIds> transient_device_ids_;
+  std::unique_ptr<TransientDeviceIds> transient_device_ids_;
 };
 
 }  // namespace storage_monitor
 
 #endif  // COMPONENTS_STORAGE_MONITOR_STORAGE_MONITOR_H_