Remove use of weakptr for RemovableDeviceNotificationsMac

chrome/browser/system_monitor/removable_device_notifications_mac_unittest.mm

 // 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/system_monitor/removable_device_notifications_mac.h"
 
 #include "base/file_util.h"
 #include "base/mac/foundation_util.h"
 #include "base/message_loop.h"
 #include "base/scoped_temp_dir.h"
@@ skipping 37 matching lines @@
   }
 
   virtual void SetUp() OVERRIDE {
     base::SystemMonitor::AllocateSystemIOPorts();
     system_monitor_.reset(new base::SystemMonitor());
 
     mock_devices_changed_observer_.reset(new base::MockDevicesChangedObserver);
     system_monitor_->AddDevicesChangedObserver(
         mock_devices_changed_observer_.get());
 
-    notifications_.reset(new RemovableDeviceNotificationsMac);
+    notifications_ = new RemovableDeviceNotificationsMac;
 
     unique_id_ = "test_id";
     display_name_ = ASCIIToUTF16("Test Display Name");
     mount_point_ = FilePath("/unused_test_directory");
     device_id_ = MediaStorageUtil::MakeDeviceId(
         MediaStorageUtil::REMOVABLE_MASS_STORAGE_NO_DCIM, unique_id_);
     disk_info_ = CreateDiskInfoMac(unique_id_, display_name_, mount_point_);
   }
 
  protected:
   // The message loop and file thread to run tests on.
   MessageLoop message_loop_;
   content::TestBrowserThread file_thread_;
 
   // SystemMonitor and DevicesChangedObserver to hook together to test.
   scoped_ptr<base::SystemMonitor> system_monitor_;
   scoped_ptr<base::MockDevicesChangedObserver> mock_devices_changed_observer_;
 
   // Information about the disk.
   std::string unique_id_;
   string16 display_name_;
   FilePath mount_point_;
   std::string device_id_;
   DiskInfoMac disk_info_;
 
-  scoped_ptr<RemovableDeviceNotificationsMac> notifications_;
+  scoped_refptr<RemovableDeviceNotificationsMac> notifications_;
 };
 
 TEST_F(RemovableDeviceNotificationsMacTest, AddRemove) {
   {
     EXPECT_CALL(*mock_devices_changed_observer_,
                 OnRemovableStorageAttached(device_id_,
                                            display_name_,
                                            mount_point_.value()));
     notifications_->UpdateDisk(
         disk_info_, RemovableDeviceNotificationsMac::UPDATE_DEVICE_ADDED);
@@ skipping 73 matching lines @@
       mount_point_.AppendASCII("foo"), &info));
   EXPECT_EQ(info.device_id, device_id_);
   EXPECT_EQ(info.name, display_name_);
   EXPECT_EQ(info.location, mount_point_.value());
 
   EXPECT_FALSE(notifications_->GetDeviceInfoForPath(
       FilePath("/non/matching/path"), &info));
 }
 
 }  // namespace chrome