| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/files/file_util.h" | 7 #include "base/files/file_util.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 | 72 |
| 73 static void PostQuitToUIThread() { | 73 static void PostQuitToUIThread() { |
| 74 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, | 74 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 75 base::MessageLoop::QuitWhenIdleClosure()); | 75 base::MessageLoop::QuitWhenIdleClosure()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 static void WaitForFileThread() { | 78 static void WaitForFileThread() { |
| 79 BrowserThread::PostTask(BrowserThread::FILE, | 79 BrowserThread::PostTask(BrowserThread::FILE, |
| 80 FROM_HERE, | 80 FROM_HERE, |
| 81 base::Bind(&PostQuitToUIThread)); | 81 base::Bind(&PostQuitToUIThread)); |
| 82 base::MessageLoop::current()->Run(); | 82 base::RunLoop().Run(); |
| 83 } | 83 } |
| 84 | 84 |
| 85 private: | 85 private: |
| 86 content::TestBrowserThreadBundle thread_bundle_; | 86 content::TestBrowserThreadBundle thread_bundle_; |
| 87 TestStorageMonitor* monitor_; | 87 TestStorageMonitor* monitor_; |
| 88 base::ScopedTempDir scoped_temp_dir_; | 88 base::ScopedTempDir scoped_temp_dir_; |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 // Test to verify that HasDcim() function returns true for the given media | 91 // Test to verify that HasDcim() function returns true for the given media |
| 92 // device mount point. | 92 // device mount point. |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 event.Reset(); | 147 event.Reset(); |
| 148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, | 148 BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, |
| 149 base::Bind(&MediaStorageUtil::FilterAttachedDevices, | 149 base::Bind(&MediaStorageUtil::FilterAttachedDevices, |
| 150 base::Unretained(&devices), signal_event)); | 150 base::Unretained(&devices), signal_event)); |
| 151 event.Wait(); | 151 event.Wait(); |
| 152 | 152 |
| 153 EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end()); | 153 EXPECT_TRUE(devices.find(kImageCaptureDeviceId) != devices.end()); |
| 154 } | 154 } |
| 155 | 155 |
| 156 } // namespace storage_monitor | 156 } // namespace storage_monitor |
| OLD | NEW |