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

Side by Side Diff: chrome/browser/extensions/api/content_settings/content_settings_store_unittest.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 "chrome/browser/extensions/api/content_settings/content_settings_store. h" 5 #include "chrome/browser/extensions/api/content_settings/content_settings_store. h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory> 9 #include <memory>
10 10
11 #include "base/memory/ptr_util.h" 11 #include "base/memory/ptr_util.h"
12 #include "base/values.h" 12 #include "base/values.h"
13 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h" 13 #include "chrome/browser/extensions/api/content_settings/content_settings_api_co nstants.h"
14 #include "components/content_settings/core/browser/content_settings_registry.h" 14 #include "components/content_settings/core/browser/content_settings_registry.h"
15 #include "components/content_settings/core/browser/content_settings_rule.h" 15 #include "components/content_settings/core/browser/content_settings_rule.h"
16 #include "components/content_settings/core/browser/content_settings_utils.h" 16 #include "components/content_settings/core/browser/content_settings_utils.h"
17 #include "components/content_settings/core/common/content_settings_utils.h"
17 #include "components/content_settings/core/test/content_settings_test_utils.h" 18 #include "components/content_settings/core/test/content_settings_test_utils.h"
18 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
19 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
20 #include "url/gurl.h" 21 #include "url/gurl.h"
21 22
22 using ::testing::Mock; 23 using ::testing::Mock;
23 24
24 namespace extensions { 25 namespace extensions {
25 26
26 namespace keys = content_settings_api_constants; 27 namespace keys = content_settings_api_constants;
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 url, 326 url,
326 url, 327 url,
327 CONTENT_SETTINGS_TYPE_COOKIES, 328 CONTENT_SETTINGS_TYPE_COOKIES,
328 std::string(), 329 std::string(),
329 false)); 330 false));
330 331
331 store()->RemoveObserver(&observer); 332 store()->RemoveObserver(&observer);
332 } 333 }
333 334
334 } // namespace extensions 335 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698