Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(279)

Side by Side Diff: chrome/browser/media_galleries/media_folder_finder_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/base_paths.h" 10 #include "base/base_paths.h"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/file_util.h" 12 #include "base/files/file_util.h"
13 #include "base/files/scoped_temp_dir.h" 13 #include "base/files/scoped_temp_dir.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/test/scoped_path_override.h" 16 #include "base/test/scoped_path_override.h"
17 #include "base/threading/sequenced_worker_pool.h" 17 #include "base/threading/sequenced_worker_pool.h"
18 #include "chrome/browser/media_galleries/media_scan_types.h" 18 #include "chrome/browser/media_galleries/media_scan_types.h"
19 #include "chrome/common/chrome_paths.h" 19 #include "chrome/common/chrome_paths.h"
20 #include "content/public/browser/browser_thread.h" 20 #include "content/public/browser/browser_thread.h"
21 #include "content/public/test/test_browser_thread_bundle.h" 21 #include "content/public/test/test_browser_thread_bundle.h"
22 22
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 402
403 // |fake_home_dir| and its ancestors do not show up in results. 403 // |fake_home_dir| and its ancestors do not show up in results.
404 expected_results.erase(fake_dir()); 404 expected_results.erase(fake_dir());
405 expected_results.erase(fake_home_dir); 405 expected_results.erase(fake_home_dir);
406 406
407 CreateMediaFolderFinder(folders, true, expected_results); 407 CreateMediaFolderFinder(folders, true, expected_results);
408 StartScan(); 408 StartScan();
409 RunLoopUntilReceivedCallback(); 409 RunLoopUntilReceivedCallback();
410 DeleteMediaFolderFinder(); 410 DeleteMediaFolderFinder();
411 } 411 }
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/media_folder_finder.cc ('k') | chrome/browser/media_galleries/media_galleries_test_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698