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

Side by Side Diff: components/content_settings/core/test/content_settings_test_utils.cc

Issue 2938163002: Store base::Value in ContentSettingPatternSource instead of an enum (Closed)
Patch Set: rebased Created 3 years, 5 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 #include "components/content_settings/core/test/content_settings_test_utils.h" 5 #include "components/content_settings/core/test/content_settings_test_utils.h"
6 6
7 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h" 7 #include "components/content_settings/core/browser/content_settings_observable_p rovider.h"
8 #include "components/content_settings/core/browser/host_content_settings_map.h" 8 #include "components/content_settings/core/browser/host_content_settings_map.h"
9 #include "components/content_settings/core/common/content_settings_types.h" 9 #include "components/content_settings/core/common/content_settings_types.h"
10 #include "components/content_settings/core/common/content_settings_utils.h"
10 11
11 namespace content_settings { 12 namespace content_settings {
12 13
13 // static 14 // static
14 base::Value* TestUtils::GetContentSettingValue( 15 base::Value* TestUtils::GetContentSettingValue(
15 const ProviderInterface* provider, 16 const ProviderInterface* provider,
16 const GURL& primary_url, 17 const GURL& primary_url,
17 const GURL& secondary_url, 18 const GURL& secondary_url,
18 ContentSettingsType content_type, 19 ContentSettingsType content_type,
19 const std::string& resource_identifier, 20 const std::string& resource_identifier,
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 HostContentSettingsMap* map, 55 HostContentSettingsMap* map,
55 std::unique_ptr<content_settings::ObservableProvider> provider, 56 std::unique_ptr<content_settings::ObservableProvider> provider,
56 HostContentSettingsMap::ProviderType type) { 57 HostContentSettingsMap::ProviderType type) {
57 if (map->content_settings_providers_[type]) { 58 if (map->content_settings_providers_[type]) {
58 map->content_settings_providers_[type]->ShutdownOnUIThread(); 59 map->content_settings_providers_[type]->ShutdownOnUIThread();
59 } 60 }
60 map->content_settings_providers_[type] = std::move(provider); 61 map->content_settings_providers_[type] = std::move(provider);
61 } 62 }
62 63
63 } // namespace content_settings 64 } // namespace content_settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698