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

Side by Side Diff: chrome/browser/extensions/extension_prefs_unittest.cc

Issue 10381097: Move content settings extension API to content_settings dir. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed conflict Created 8 years, 7 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 "extension_prefs_unittest.h" 5 #include "extension_prefs_unittest.h"
6 6
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/scoped_temp_dir.h" 8 #include "base/scoped_temp_dir.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "base/string_number_conversions.h" 10 #include "base/string_number_conversions.h"
(...skipping 917 matching lines...) Expand 10 before | Expand all | Expand 10 after
928 } 928 }
929 int iteration_; 929 int iteration_;
930 }; 930 };
931 TEST_F(ExtensionPrefsInstallIncognitoSessionOnly, 931 TEST_F(ExtensionPrefsInstallIncognitoSessionOnly,
932 ExtensionPrefsInstallOneExtension) {} 932 ExtensionPrefsInstallOneExtension) {}
933 933
934 class ExtensionPrefsUninstallExtension : public ExtensionPrefsPrepopulatedTest { 934 class ExtensionPrefsUninstallExtension : public ExtensionPrefsPrepopulatedTest {
935 virtual void Initialize() { 935 virtual void Initialize() {
936 InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1")); 936 InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
937 InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2")); 937 InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));
938 ExtensionContentSettingsStore* store = prefs()->content_settings_store(); 938 extensions::ContentSettingsStore* store = prefs()->content_settings_store();
939 ContentSettingsPattern pattern = 939 ContentSettingsPattern pattern =
940 ContentSettingsPattern::FromString("http://[*.]example.com"); 940 ContentSettingsPattern::FromString("http://[*.]example.com");
941 store->SetExtensionContentSetting(ext1_->id(), 941 store->SetExtensionContentSetting(ext1_->id(),
942 pattern, pattern, 942 pattern, pattern,
943 CONTENT_SETTINGS_TYPE_IMAGES, 943 CONTENT_SETTINGS_TYPE_IMAGES,
944 std::string(), 944 std::string(),
945 CONTENT_SETTING_BLOCK, 945 CONTENT_SETTING_BLOCK,
946 kExtensionPrefsScopeRegular); 946 kExtensionPrefsScopeRegular);
947 947
948 UninstallExtension(ext1_->id()); 948 UninstallExtension(ext1_->id());
(...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after
1131 ++iteration_; 1131 ++iteration_;
1132 } else { 1132 } else {
1133 EXPECT_EQ(kDefaultPref1, actual); 1133 EXPECT_EQ(kDefaultPref1, actual);
1134 } 1134 }
1135 } 1135 }
1136 1136
1137 private: 1137 private:
1138 int iteration_; 1138 int iteration_;
1139 }; 1139 };
1140 TEST_F(ExtensionPrefsDisableExtensions, ExtensionPrefsDisableExtensions) {} 1140 TEST_F(ExtensionPrefsDisableExtensions, ExtensionPrefsDisableExtensions) {}
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_prefs.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698