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

Side by Side Diff: extensions/shell/browser/shell_prefs_unittest.cc

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « extensions/shell/browser/shell_prefs.cc ('k') | ios/chrome/browser/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "extensions/shell/browser/shell_prefs.h" 5 #include "extensions/shell/browser/shell_prefs.h"
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_service.h"
9 #include "build/build_config.h" 10 #include "build/build_config.h"
10 #include "components/prefs/pref_service.h"
11 #include "components/user_prefs/user_prefs.h" 11 #include "components/user_prefs/user_prefs.h"
12 #include "content/public/test/test_browser_context.h" 12 #include "content/public/test/test_browser_context.h"
13 #include "content/public/test/test_browser_thread_bundle.h" 13 #include "content/public/test/test_browser_thread_bundle.h"
14 #include "extensions/common/extension_paths.h" 14 #include "extensions/common/extension_paths.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 16
17 namespace extensions { 17 namespace extensions {
18 namespace { 18 namespace {
19 19
20 // A BrowserContext that uses a test data directory as its data path. 20 // A BrowserContext that uses a test data directory as its data path.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 // User prefs from the file have been read correctly. 71 // User prefs from the file have been read correctly.
72 EXPECT_EQ("1.2.3.4", service->GetString("extensions.last_chrome_version")); 72 EXPECT_EQ("1.2.3.4", service->GetString("extensions.last_chrome_version"));
73 EXPECT_EQ(123, service->GetInteger("extensions.toolbarsize")); 73 EXPECT_EQ(123, service->GetInteger("extensions.toolbarsize"));
74 74
75 // The user prefs system has been initialized. 75 // The user prefs system has been initialized.
76 EXPECT_EQ(service.get(), user_prefs::UserPrefs::Get(&browser_context_)); 76 EXPECT_EQ(service.get(), user_prefs::UserPrefs::Get(&browser_context_));
77 } 77 }
78 78
79 } // namespace 79 } // namespace
80 } // namespace extensions 80 } // namespace extensions
OLDNEW
« no previous file with comments | « extensions/shell/browser/shell_prefs.cc ('k') | ios/chrome/browser/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698