chrome/browser/component_updater/test/cld_component_installer_unittest.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/browser/component_updater/test/cld_component_installer_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

« no previous file with comments | « chrome/browser/component_updater/swiftshader_component_installer.cc ('k') | chrome/browser/component_updater/test/component_installers_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <vector>	5 #include <vector>

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 "base/files/scoped_temp_dir.h"	9 #include "base/files/scoped_temp_dir.h"

10 #include "base/macros.h"	10 #include "base/macros.h"

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

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

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

14 #include "base/values.h"	14 #include "base/values.h"

15 #include "base/version.h"	15 #include "base/version.h"

16 #include "chrome/browser/component_updater/cld_component_installer.h"	16 #include "chrome/browser/component_updater/cld_component_installer.h"

17 #include "components/translate/content/browser/browser_cld_data_provider.h"	17 #include "components/translate/content/browser/browser_cld_data_provider.h"

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

(...skipping 98 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
117 traits_.ComponentReady(version, install_dir, manifest.Pass());	117 traits_.ComponentReady(version, install_dir, manifest.Pass());

118 base::FilePath result =	118 base::FilePath result =

119 CldComponentInstallerTraits::GetLatestCldDataFile();	119 CldComponentInstallerTraits::GetLatestCldDataFile();

120 ASSERT_TRUE(StartsWith(result.AsUTF16Unsafe(),	120 ASSERT_TRUE(StartsWith(result.AsUTF16Unsafe(),

121 install_dir.AsUTF16Unsafe(),	121 install_dir.AsUTF16Unsafe(),

122 true));	122 true));

123 ASSERT_TRUE(EndsWith(result.value(), kTestCldDataFileName, true));	123 ASSERT_TRUE(EndsWith(result.value(), kTestCldDataFileName, true));

124 }	124 }

125	125

126 } // namespace component_updater	126 } // namespace component_updater

OLD	NEW