chrome/utility/importer/safari_importer_unittest.mm - 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/utility/importer/safari_importer_unittest.mm

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/utility/importer/safari_importer.mm ('k') | chrome/utility/media_galleries/pmp_column_reader.cc » ('j') | no next file with comments »

OLD	NEW
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/utility/importer/safari_importer.h"	5 #include "chrome/utility/importer/safari_importer.h"

6	6

7 #include "base/basictypes.h"	7 #include "base/basictypes.h"

8 #include "base/file_util.h"

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

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

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

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

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

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

14 #include "base/strings/sys_string_conversions.h"	14 #include "base/strings/sys_string_conversions.h"

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

16 #include "chrome/common/chrome_paths.h"	16 #include "chrome/common/chrome_paths.h"

17 #include "chrome/common/importer/imported_bookmark_entry.h"	17 #include "chrome/common/importer/imported_bookmark_entry.h"

18 #include "chrome/common/importer/imported_favicon_usage.h"	18 #include "chrome/common/importer/imported_favicon_usage.h"

19 #include "chrome/common/importer/importer_bridge.h"	19 #include "chrome/common/importer/importer_bridge.h"

(...skipping 242 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
262 EXPECT_EQ(items & importer::COOKIES, importer::NONE);	262 EXPECT_EQ(items & importer::COOKIES, importer::NONE);

263 EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);	263 EXPECT_EQ(items & importer::PASSWORDS, importer::NONE);

264 EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);	264 EXPECT_EQ(items & importer::SEARCH_ENGINES, importer::NONE);

265 EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);	265 EXPECT_EQ(items & importer::HOME_PAGE, importer::NONE);

266	266

267 // Check that we don't import anything from a bogus library directory.	267 // Check that we don't import anything from a bogus library directory.

268 base::ScopedTempDir fake_library_dir;	268 base::ScopedTempDir fake_library_dir;

269 ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());	269 ASSERT_TRUE(fake_library_dir.CreateUniqueTempDir());

270 EXPECT_FALSE(SafariImporterCanImport(fake_library_dir.path(), &items));	270 EXPECT_FALSE(SafariImporterCanImport(fake_library_dir.path(), &items));

271 }	271 }

OLD	NEW