Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Side by Side Diff: chrome/common/importer/firefox_importer_utils_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
OLDNEW
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/importer/firefox_importer_utils.h" 5 #include "chrome/common/importer/firefox_importer_utils.h"
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/grit/generated_resources.h" 10 #include "chrome/grit/generated_resources.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
13 13
14 namespace { 14 namespace {
15 15
16 struct GetPrefsJsValueCase { 16 struct GetPrefsJsValueCase {
17 std::string prefs_content; 17 std::string prefs_content;
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 150
151 base::DictionaryValue default_second; 151 base::DictionaryValue default_second;
152 default_second.SetString("Profile0.Path", "first"); 152 default_second.SetString("Profile0.Path", "first");
153 default_second.SetString("Profile0.IsRelative", "0"); 153 default_second.SetString("Profile0.IsRelative", "0");
154 default_second.SetString("Profile1.Path", "second"); 154 default_second.SetString("Profile1.Path", "second");
155 default_second.SetString("Profile1.IsRelative", "0"); 155 default_second.SetString("Profile1.IsRelative", "0");
156 default_second.SetString("Profile1.Default", "1"); 156 default_second.SetString("Profile1.Default", "1");
157 EXPECT_EQ("second", 157 EXPECT_EQ("second",
158 GetFirefoxProfilePathFromDictionary(default_second).MaybeAsASCII()); 158 GetFirefoxProfilePathFromDictionary(default_second).MaybeAsASCII());
159 } 159 }
OLDNEW
« no previous file with comments | « chrome/common/importer/firefox_importer_utils_mac.mm ('k') | chrome/common/importer/firefox_importer_utils_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698