chrome/common/media_galleries/picasa_test_util.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/common/media_galleries/picasa_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

« no previous file with comments | « chrome/common/mac/mock_launchd.cc ('k') | chrome/common/media_galleries/pmp_test_util.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/common/media_galleries/picasa_test_util.h"	5 #include "chrome/common/media_galleries/picasa_test_util.h"

6	6

7 #include "base/file_util.h"

8 #include "base/files/file_path.h"	7 #include "base/files/file_path.h"

	8 #include "base/files/file_util.h"

9 #include "chrome/common/media_galleries/picasa_types.h"	9 #include "chrome/common/media_galleries/picasa_types.h"

10 #include "chrome/common/media_galleries/pmp_test_util.h"	10 #include "chrome/common/media_galleries/pmp_test_util.h"

11 #include "testing/gtest/include/gtest/gtest.h"	11 #include "testing/gtest/include/gtest/gtest.h"

12	12

13 namespace picasa {	13 namespace picasa {

14	14

15 void WriteAlbumTable(const base::FilePath& column_file_destination,	15 void WriteAlbumTable(const base::FilePath& column_file_destination,

16 const std::vector<uint32>& category_vector,	16 const std::vector<uint32>& category_vector,

17 const std::vector<double>& date_vector,	17 const std::vector<double>& date_vector,

18 const std::vector<std::string>& filename_vector,	18 const std::vector<std::string>& filename_vector,

(...skipping 87 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 const char folder_2_test_ini[] =	106 const char folder_2_test_ini[] =

107 "[InFirstAlbumOnly.jpg]\n"	107 "[InFirstAlbumOnly.jpg]\n"

108 "albums=uid3\n";	108 "albums=uid3\n";

109 ASSERT_TRUE(	109 ASSERT_TRUE(

110 base::WriteFile(test_folder_2_path.AppendASCII(kPicasaINIFilename),	110 base::WriteFile(test_folder_2_path.AppendASCII(kPicasaINIFilename),

111 folder_2_test_ini,	111 folder_2_test_ini,

112 arraysize(folder_2_test_ini)));	112 arraysize(folder_2_test_ini)));

113 }	113 }

114	114

115 } // namespace picasa	115 } // namespace picasa

OLD	NEW