Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / media_galleries / win / mtp_device_delegate_impl_win_unittest.cc

diff --git a/src/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc b/src/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
index ab98bc8..3151354 100644 (file)
--- a/src/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
+++ b/src/chrome/browser/media_galleries/win/mtp_device_delegate_impl_win_unittest.cc
@@ -53,8 +53,8 @@ void GetGalleryInfoCallback(
 
 class MTPDeviceDelegateImplWinTest : public ChromeRenderViewHostTestHarness {
  protected:
-  void SetUp() OVERRIDE;
-  void TearDown() OVERRIDE;
+  void SetUp() override;
+  void TearDown() override;
 
   void ProcessAttach(const std::string& id,
                      const base::string16& name,
@@ -88,7 +88,7 @@ void MTPDeviceDelegateImplWinTest::SetUp() {
   TestingBrowserProcess* browser_process = TestingBrowserProcess::GetGlobal();
   DCHECK(browser_process);
   monitor_ = monitor.get();
-  StorageMonitor::SetStorageMonitorForTesting(monitor.PassAs<StorageMonitor>());
+  StorageMonitor::SetStorageMonitorForTesting(monitor.Pass());
 
   base::RunLoop runloop;
   browser_process->media_file_system_registry()->GetPreferences(profile())->