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

Side by Side Diff: chrome/installer/util/master_preferences_unittest.cc

Issue 497083004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@file_util
Patch Set: Created 6 years, 4 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
OLDNEW
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 // Unit tests for master preferences related methods. 5 // Unit tests for master preferences related methods.
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/chrome_paths.h" 12 #include "chrome/common/chrome_paths.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/installer/util/master_preferences.h" 14 #include "chrome/installer/util/master_preferences.h"
15 #include "chrome/installer/util/master_preferences_constants.h" 15 #include "chrome/installer/util/master_preferences_constants.h"
16 #include "chrome/installer/util/util_constants.h" 16 #include "chrome/installer/util/util_constants.h"
17 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
471 // The MasterPreferences dictionary should also conjure up the new setting 471 // The MasterPreferences dictionary should also conjure up the new setting
472 // as per EnforceLegacyPreferences. 472 // as per EnforceLegacyPreferences.
473 const base::ListValue* new_startup_urls_list = NULL; 473 const base::ListValue* new_startup_urls_list = NULL;
474 EXPECT_TRUE(master_dictionary.GetList(prefs::kURLsToRestoreOnStartup, 474 EXPECT_TRUE(master_dictionary.GetList(prefs::kURLsToRestoreOnStartup,
475 &new_startup_urls_list)); 475 &new_startup_urls_list));
476 ASSERT_TRUE(new_startup_urls_list != NULL); 476 ASSERT_TRUE(new_startup_urls_list != NULL);
477 std::string new_url_value; 477 std::string new_url_value;
478 EXPECT_TRUE(new_startup_urls_list->GetString(0, &new_url_value)); 478 EXPECT_TRUE(new_startup_urls_list->GetString(0, &new_url_value));
479 EXPECT_EQ("http://www.example.com", new_url_value); 479 EXPECT_EQ("http://www.example.com", new_url_value);
480 } 480 }
OLDNEW
« no previous file with comments | « chrome/installer/util/master_preferences.cc ('k') | chrome/installer/util/move_tree_work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698