chrome/browser/first_run/first_run_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/first_run/first_run_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/first_run/first_run_internal_win.cc ('k') | chrome/browser/first_run/upgrade_util_linux.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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 "base/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/compiler_specific.h"	6 #include "base/compiler_specific.h"

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

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

9 #include "base/test/scoped_path_override.h"	9 #include "base/test/scoped_path_override.h"

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

11 #include "chrome/browser/first_run/first_run.h"	11 #include "chrome/browser/first_run/first_run.h"

12 #include "chrome/browser/first_run/first_run_internal.h"	12 #include "chrome/browser/first_run/first_run_internal.h"

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

14 #include "chrome/installer/util/master_preferences.h"	14 #include "chrome/installer/util/master_preferences.h"

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

16	16

17 namespace first_run {	17 namespace first_run {

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55	55

56 MasterPrefs out_prefs;	56 MasterPrefs out_prefs;

57 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);	57 internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);

58 EXPECT_EQ("xyz", out_prefs.variations_seed);	58 EXPECT_EQ("xyz", out_prefs.variations_seed);

59 EXPECT_EQ("abc", out_prefs.variations_seed_signature);	59 EXPECT_EQ("abc", out_prefs.variations_seed_signature);

60 // Variations prefs should have been extracted (removed) from the dictionary.	60 // Variations prefs should have been extracted (removed) from the dictionary.

61 EXPECT_TRUE(install_prefs.master_dictionary().empty());	61 EXPECT_TRUE(install_prefs.master_dictionary().empty());

62 }	62 }

63	63

64 } // namespace first_run	64 } // namespace first_run

OLD	NEW