| 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 "chrome/browser/media_galleries/media_folder_finder.h" | 5 #include "chrome/browser/media_galleries/media_folder_finder.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 } | 137 } |
| 138 | 138 |
| 139 void RunLoopUntilReceivedCallback() { | 139 void RunLoopUntilReceivedCallback() { |
| 140 while (!received_results()) | 140 while (!received_results()) |
| 141 RunLoop(); | 141 RunLoop(); |
| 142 } | 142 } |
| 143 | 143 |
| 144 private: | 144 private: |
| 145 void OnGotResults( | 145 void OnGotResults( |
| 146 bool success, | 146 bool success, |
| 147 const MediaFolderFinder::MediaFolderFinderResults& results) { | 147 const MediaFolderFinder::MediaFolderFinderResults& results, |
| 148 const std::vector<base::FilePath>& /*sensitive_locations*/) { |
| 148 received_results_ = true; | 149 received_results_ = true; |
| 149 EXPECT_EQ(expected_success_, success); | 150 EXPECT_EQ(expected_success_, success); |
| 150 std::set<base::FilePath> expected_keys = | 151 std::set<base::FilePath> expected_keys = |
| 151 GetKeysFromResults(expected_results_); | 152 GetKeysFromResults(expected_results_); |
| 152 ASSERT_EQ(expected_keys, GetKeysFromResults(results)); | 153 ASSERT_EQ(expected_keys, GetKeysFromResults(results)); |
| 153 for (MediaFolderFinder::MediaFolderFinderResults::const_iterator it = | 154 for (MediaFolderFinder::MediaFolderFinderResults::const_iterator it = |
| 154 results.begin(); | 155 results.begin(); |
| 155 it != results.end(); ++it) { | 156 it != results.end(); ++it) { |
| 156 const base::FilePath& folder = it->first; | 157 const base::FilePath& folder = it->first; |
| 157 const MediaGalleryScanResult& expected = it->second; | 158 const MediaGalleryScanResult& expected = it->second; |
| (...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 folders.push_back(dir1); | 335 folders.push_back(dir1); |
| 335 | 336 |
| 336 CreateTestFile(dir1, MEDIA_GALLERY_SCAN_FILE_TYPE_IMAGE, 1, true, | 337 CreateTestFile(dir1, MEDIA_GALLERY_SCAN_FILE_TYPE_IMAGE, 1, true, |
| 337 &expected_results); | 338 &expected_results); |
| 338 | 339 |
| 339 CreateMediaFolderFinder(folders, true, expected_results); | 340 CreateMediaFolderFinder(folders, true, expected_results); |
| 340 StartScan(); | 341 StartScan(); |
| 341 RunLoopUntilReceivedCallback(); | 342 RunLoopUntilReceivedCallback(); |
| 342 DeleteMediaFolderFinder(); | 343 DeleteMediaFolderFinder(); |
| 343 } | 344 } |
| OLD | NEW |