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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/extension_prefs_unittest.cc

Issue 12212047: Linux/ChromeOS Chromium style checker cleanup, chrome/browser/extensions edition. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/extensions/extension_messages_apitest.cc ('k') | chrome/browser/extensions/extension_process_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_prefs_unittest.cc
===================================================================
--- chrome/browser/extensions/extension_prefs_unittest.cc (revision 181040)
+++ chrome/browser/extensions/extension_prefs_unittest.cc (working copy)
@@ -84,14 +84,14 @@
: extension_time_(Time::Now() - TimeDelta::FromHours(4)),
blacklist_time_(Time::Now() - TimeDelta::FromHours(2)) {}
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension_id_ = prefs_.AddExtensionAndReturnId("last_ping_day");
EXPECT_TRUE(prefs()->LastPingDay(extension_id_).is_null());
prefs()->SetLastPingDay(extension_id_, extension_time_);
prefs()->SetBlacklistLastPingDay(blacklist_time_);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
Time result = prefs()->LastPingDay(extension_id_);
EXPECT_FALSE(result.is_null());
EXPECT_TRUE(result == extension_time_);
@@ -122,7 +122,7 @@
// Test the MediaGalleries permissions functions.
class MediaGalleriesPermissions : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension1_id_ = prefs_.AddExtensionAndReturnId("test1");
extension2_id_ = prefs_.AddExtensionAndReturnId("test2");
extension3_id_ = prefs_.AddExtensionAndReturnId("test3");
@@ -164,7 +164,7 @@
Verify();
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
struct TestData {
std::string* id;
std::vector<chrome::MediaGalleryPermission>* expectation;
@@ -206,7 +206,7 @@
// Tests the GetToolbarOrder/SetToolbarOrder functions.
class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
list_.push_back(prefs_.AddExtensionAndReturnId("1"));
list_.push_back(prefs_.AddExtensionAndReturnId("2"));
list_.push_back(prefs_.AddExtensionAndReturnId("3"));
@@ -215,7 +215,7 @@
prefs()->SetToolbarOrder(list_);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::vector<std::string> result = prefs()->GetToolbarOrder();
ASSERT_EQ(list_.size(), result.size());
for (size_t i = 0; i < list_.size(); i++) {
@@ -232,12 +232,12 @@
// Tests the IsExtensionDisabled/SetExtensionState functions.
class ExtensionPrefsExtensionState : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension = prefs_.AddExtension("test");
prefs()->SetExtensionState(extension->id(), Extension::DISABLED);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_TRUE(prefs()->IsExtensionDisabled(extension->id()));
}
@@ -248,12 +248,12 @@
class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension = prefs_.AddExtension("test");
prefs()->SetDidExtensionEscalatePermissions(extension.get(), true);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_TRUE(prefs()->DidExtensionEscalatePermissions(extension->id()));
}
@@ -265,7 +265,7 @@
// Tests the AddGrantedPermissions / GetGrantedPermissions functions.
class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
const APIPermissionInfo* permission_info =
PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket);
@@ -385,7 +385,7 @@
EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts());
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
scoped_refptr<PermissionSet> permissions(
prefs()->GetGrantedPermissions(extension_id_));
EXPECT_TRUE(permissions.get());
@@ -416,7 +416,7 @@
// Tests the SetActivePermissions / GetActivePermissions functions.
class ExtensionPrefsActivePermissions : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension_id_ = prefs_.AddExtensionAndReturnId("test");
APIPermissionSet api_perms;
@@ -449,7 +449,7 @@
EXPECT_EQ(*active_perms_, *active);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
scoped_refptr<PermissionSet> permissions(
prefs()->GetActivePermissions(extension_id_));
EXPECT_EQ(*active_perms_, *permissions);
@@ -464,14 +464,14 @@
// Tests the GetVersionString function.
class ExtensionPrefsVersionString : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension = prefs_.AddExtension("test");
EXPECT_EQ("0.1", prefs()->GetVersionString(extension->id()));
prefs()->OnExtensionUninstalled(extension->id(),
Manifest::INTERNAL, false);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_EQ("", prefs()->GetVersionString(extension->id()));
}
@@ -482,7 +482,7 @@
class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
not_installed_id_ = "pghjnghklobnfoidcldiidjjjhkeeaoi";
// Install some extensions.
@@ -515,7 +515,7 @@
prefs()->AcknowledgeBlacklistedExtension(not_installed_id_);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
ExtensionList::const_iterator iter;
for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) {
std::string id = (*iter)->id();
@@ -546,7 +546,7 @@
// Tests force hiding browser actions.
class ExtensionPrefsHidingBrowserActions : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
// Install 5 extensions.
for (int i = 0; i < 5; i++) {
std::string name = "test" + base::IntToString(i);
@@ -561,7 +561,7 @@
prefs()->SetBrowserActionVisibility(extensions_[1], true);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
// Make sure the one we hid is hidden.
EXPECT_FALSE(prefs()->GetBrowserActionVisibility(extensions_[0]));
@@ -619,7 +619,7 @@
return false;
}
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
PathService::Get(chrome::DIR_TEST_DATA, &basedir_);
now_ = Time::Now();
id1_ = prefs_.AddExtensionAndReturnId("1");
@@ -662,7 +662,7 @@
prefs()->RemoveDelayedInstallInfo(id3_);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
// Make sure the info for the 3 extensions we expect is present.
scoped_ptr<extensions::ExtensionPrefs::ExtensionsInfo> info(
prefs()->GetAllDelayedInstallInfo());
@@ -690,7 +690,7 @@
class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension_ = prefs_.AddExtension("on_extension_installed");
EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id()));
prefs()->OnExtensionInstalled(
@@ -698,7 +698,7 @@
syncer::StringOrdinal());
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id()));
}
@@ -710,14 +710,14 @@
class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
extension_ = prefs_.AddExtension("on_extension_installed");
EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id()));
prefs()->OnExtensionInstalled(extension_.get(), Extension::ENABLED,
syncer::StringOrdinal());
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
// Set the flag and see if it persisted.
prefs()->SetAppDraggedByUser(extension_->id());
EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id()));
@@ -734,7 +734,7 @@
class ExtensionPrefsFlags : public ExtensionPrefsTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
{
base::DictionaryValue dictionary;
dictionary.SetString(extension_manifest_keys::kName, "from_webstore");
@@ -763,7 +763,7 @@
}
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_TRUE(prefs()->IsFromWebStore(webstore_extension_->id()));
EXPECT_FALSE(prefs()->IsFromBookmark(webstore_extension_->id()));
@@ -893,10 +893,10 @@
class ExtensionPrefsInstallOneExtension
: public ExtensionPrefsPrepopulatedTest {
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
}
@@ -907,7 +907,7 @@
class ExtensionPrefsInstallIncognitoPersistent
: public ExtensionPrefsPrepopulatedTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
InstallExtControlledPrefIncognito(ext1_, kPref1,
Value::CreateStringValue("val2"));
@@ -915,7 +915,7 @@
std::string actual = incog_prefs->GetString(kPref1);
EXPECT_EQ("val2", actual);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
// Main pref service shall see only non-incognito settings.
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
@@ -934,7 +934,7 @@
public:
ExtensionPrefsInstallIncognitoSessionOnly() : iteration_(0) {}
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
InstallExtControlledPrefIncognitoSessionOnly(
ext1_, kPref1, Value::CreateStringValue("val2"));
@@ -942,7 +942,7 @@
std::string actual = incog_prefs->GetString(kPref1);
EXPECT_EQ("val2", actual);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
// Main pref service shall see only non-incognito settings.
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
@@ -964,7 +964,7 @@
ExtensionPrefsInstallOneExtension) {}
class ExtensionPrefsUninstallExtension : public ExtensionPrefsPrepopulatedTest {
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));
ContentSettingsStore* store = prefs()->content_settings_store();
@@ -979,7 +979,7 @@
UninstallExtension(ext1_->id());
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
EXPECT_EQ(NULL, prefs()->GetExtensionPref(ext1_->id()));
std::string actual;
@@ -994,7 +994,7 @@
// Tests triggering of notifications to registered observers.
class ExtensionPrefsNotifyWhenNeeded : public ExtensionPrefsPrepopulatedTest {
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
using testing::_;
using testing::Mock;
using testing::StrEq;
@@ -1060,7 +1060,7 @@
registrar.Remove(kPref1);
incognito_registrar.Remove(kPref1);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ(kDefaultPref1, actual);
}
@@ -1070,13 +1070,13 @@
// Tests disabling an extension.
class ExtensionPrefsDisableExt : public ExtensionPrefsPrepopulatedTest {
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
prefs()->SetExtensionState(ext1_->id(), Extension::DISABLED);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ(kDefaultPref1, actual);
}
@@ -1085,12 +1085,12 @@
// Tests disabling and reenabling an extension.
class ExtensionPrefsReenableExt : public ExtensionPrefsPrepopulatedTest {
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
prefs()->SetExtensionState(ext1_->id(), Extension::DISABLED);
prefs()->SetExtensionState(ext1_->id(), Extension::ENABLED);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
}
@@ -1112,7 +1112,7 @@
class ExtensionPrefsSetExtensionControlledPref
: public ExtensionPrefsPrepopulatedTest {
public:
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
MockStringValue* v1 = new MockStringValue("https://www.chromium.org");
MockStringValue* v2 = new MockStringValue("https://www.chromium.org");
MockStringValue* v1i = new MockStringValue("https://www.chromium.org");
@@ -1138,7 +1138,7 @@
testing::Mock::VerifyAndClearExpectations(v2i);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
}
};
TEST_F(ExtensionPrefsSetExtensionControlledPref,
@@ -1151,12 +1151,12 @@
ExtensionPrefsDisableExtensions()
: iteration_(0) {}
virtual ~ExtensionPrefsDisableExtensions() {}
- virtual void Initialize() {
+ virtual void Initialize() OVERRIDE {
InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
// This becomes only active in the second verification phase.
prefs_.set_extensions_disabled(true);
}
- virtual void Verify() {
+ virtual void Verify() OVERRIDE {
std::string actual = prefs()->pref_service()->GetString(kPref1);
if (iteration_ == 0) {
EXPECT_EQ("val1", actual);
« no previous file with comments | « chrome/browser/extensions/extension_messages_apitest.cc ('k') | chrome/browser/extensions/extension_process_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698