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

Side by Side Diff: chrome/browser/media_galleries/media_galleries_test_util.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_galleries_test_util.h" 5 #include "chrome/browser/media_galleries/media_galleries_test_util.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <windows.h> 8 #include <windows.h>
9 #endif 9 #endif
10 10
11 #include "base/base_paths.h" 11 #include "base/base_paths.h"
12 #include "base/file_util.h"
13 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/files/file_util.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "base/strings/string_number_conversions.h" 15 #include "base/strings/string_number_conversions.h"
16 #include "base/strings/stringprintf.h" 16 #include "base/strings/stringprintf.h"
17 #include "chrome/browser/extensions/extension_service.h" 17 #include "chrome/browser/extensions/extension_service.h"
18 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" 18 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "components/crx_file/id_util.h" 21 #include "components/crx_file/id_util.h"
22 #include "extensions/browser/extension_prefs.h" 22 #include "extensions/browser/extension_prefs.h"
23 #include "extensions/browser/extension_system.h" 23 #include "extensions/browser/extension_system.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 230
231 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) { 231 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
232 #if defined(OS_WIN) 232 #if defined(OS_WIN)
233 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir); 233 return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
234 #elif defined(OS_POSIX) 234 #elif defined(OS_POSIX)
235 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir); 235 return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
236 #else 236 #else
237 NOTREACHED(); 237 NOTREACHED();
238 #endif 238 #endif
239 } 239 }
OLDNEW
« no previous file with comments | « chrome/browser/media_galleries/media_folder_finder_unittest.cc ('k') | chrome/browser/media_galleries/media_scan_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698