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

Side by Side Diff: components/content_settings/core/browser/content_settings_registry_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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/prefs/pref_registry.h"
9 #include "base/values.h" 10 #include "base/values.h"
10 #include "components/content_settings/core/browser/content_settings_info.h" 11 #include "components/content_settings/core/browser/content_settings_info.h"
11 #include "components/content_settings/core/browser/content_settings_registry.h" 12 #include "components/content_settings/core/browser/content_settings_registry.h"
12 #include "components/content_settings/core/browser/website_settings_info.h" 13 #include "components/content_settings/core/browser/website_settings_info.h"
13 #include "components/content_settings/core/browser/website_settings_registry.h" 14 #include "components/content_settings/core/browser/website_settings_registry.h"
14 #include "components/content_settings/core/common/content_settings.h" 15 #include "components/content_settings/core/common/content_settings.h"
15 #include "components/content_settings/core/common/content_settings_types.h" 16 #include "components/content_settings/core/common/content_settings_types.h"
16 #include "components/pref_registry/pref_registry_syncable.h" 17 #include "components/pref_registry/pref_registry_syncable.h"
17 #include "components/prefs/pref_registry.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 namespace content_settings { 20 namespace content_settings {
21 21
22 class ContentSettingsRegistryTest : public testing::Test { 22 class ContentSettingsRegistryTest : public testing::Test {
23 protected: 23 protected:
24 ContentSettingsRegistryTest() : registry_(&website_settings_registry_) {} 24 ContentSettingsRegistryTest() : registry_(&website_settings_registry_) {}
25 ContentSettingsRegistry* registry() { return &registry_; } 25 ContentSettingsRegistry* registry() { return &registry_; }
26 WebsiteSettingsRegistry* website_settings_registry() { 26 WebsiteSettingsRegistry* website_settings_registry() {
27 return &website_settings_registry_; 27 return &website_settings_registry_;
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 EXPECT_FALSE(cookies_found); 84 EXPECT_FALSE(cookies_found);
85 cookies_found = true; 85 cookies_found = true;
86 } 86 }
87 } 87 }
88 88
89 EXPECT_TRUE(plugins_found); 89 EXPECT_TRUE(plugins_found);
90 EXPECT_TRUE(cookies_found); 90 EXPECT_TRUE(cookies_found);
91 } 91 }
92 92
93 } // namespace content_settings 93 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698