chrome/common/media_galleries/pmp_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/pmp_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/media_galleries/picasa_test_util.cc ('k') | chrome/common/service_process_util_unittest.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/pmp_test_util.h"	5 #include "chrome/common/media_galleries/pmp_test_util.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <iterator>	8 #include <iterator>

9	9

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

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "base/strings/utf_string_conversions.h"	12 #include "base/strings/utf_string_conversions.h"

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

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

15	15

16 namespace picasa {	16 namespace picasa {

17	17

18 namespace {	18 namespace {

19	19

20 // Flatten a vector of elements into an array of bytes.	20 // Flatten a vector of elements into an array of bytes.

(...skipping 120 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
141 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint32>(	141 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint32>(

142 const PmpFieldType, const uint32, const std::vector<uint32>&);	142 const PmpFieldType, const uint32, const std::vector<uint32>&);

143 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<double>(	143 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<double>(

144 const PmpFieldType, const uint32, const std::vector<double>&);	144 const PmpFieldType, const uint32, const std::vector<double>&);

145 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint8>(	145 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint8>(

146 const PmpFieldType, const uint32, const std::vector<uint8>&);	146 const PmpFieldType, const uint32, const std::vector<uint8>&);

147 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint64>(	147 template std::vector<char> PmpTestUtil::MakeHeaderAndBody<uint64>(

148 const PmpFieldType, const uint32, const std::vector<uint64>&);	148 const PmpFieldType, const uint32, const std::vector<uint64>&);

149	149

150 } // namespace picasa	150 } // namespace picasa

OLD	NEW