diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 03:02:08 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 03:02:08 +0000 |
commit | b94584a231b160d2570cc38e78457fb852eb0c41 (patch) | |
tree | 8d03a214b0f7305c38eb8e2b6852015ae38fef07 /chrome/browser/content_settings | |
parent | 8bc6596e0bdb39d1450d595bcc62244a5f3190b9 (diff) | |
download | chromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.zip chromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.tar.gz chromium_src-b94584a231b160d2570cc38e78457fb852eb0c41.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, chrome/browser edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
Review URL: https://codereview.chromium.org/12212048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181164 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/content_settings')
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/content_settings/content_settings_default_provider.cc b/chrome/browser/content_settings/content_settings_default_provider.cc index f6304a1..9a9c738 100644 --- a/chrome/browser/content_settings/content_settings_default_provider.cc +++ b/chrome/browser/content_settings/content_settings_default_provider.cc @@ -69,11 +69,11 @@ class DefaultRuleIterator : public RuleIterator { value_.reset(value->DeepCopy()); } - bool HasNext() const { + virtual bool HasNext() const OVERRIDE { return value_.get() != NULL; } - Rule Next() { + virtual Rule Next() OVERRIDE { DCHECK(value_.get()); return Rule(ContentSettingsPattern::Wildcard(), ContentSettingsPattern::Wildcard(), diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc index 9db61172..cb92744 100644 --- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc @@ -24,7 +24,7 @@ class DefaultProviderTest : public testing::Test { : ui_thread_(BrowserThread::UI, &message_loop_), provider_(profile_.GetPrefs(), false) { } - ~DefaultProviderTest() { + virtual ~DefaultProviderTest() { provider_.ShutdownOnUIThread(); } diff --git a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc index eced832..3b2ce7e 100644 --- a/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc +++ b/chrome/browser/content_settings/content_settings_pref_provider_unittest.cc @@ -39,7 +39,7 @@ class DeadlockCheckerThread : public base::PlatformThread::Delegate { explicit DeadlockCheckerThread(PrefProvider* provider) : provider_(provider) {} - virtual void ThreadMain() { + virtual void ThreadMain() OVERRIDE { bool got_lock = provider_->lock_.Try(); EXPECT_TRUE(got_lock); if (got_lock) diff --git a/chrome/browser/content_settings/content_settings_rule_unittest.cc b/chrome/browser/content_settings/content_settings_rule_unittest.cc index c6d3816..8bdc967 100644 --- a/chrome/browser/content_settings/content_settings_rule_unittest.cc +++ b/chrome/browser/content_settings/content_settings_rule_unittest.cc @@ -19,11 +19,11 @@ class ListIterator : public RuleIterator { virtual ~ListIterator() {} - virtual bool HasNext() const { + virtual bool HasNext() const OVERRIDE { return !rules_.empty(); } - virtual Rule Next() { + virtual Rule Next() OVERRIDE { EXPECT_FALSE(rules_.empty()); // |front()| returns a reference but we're going to discard the object // referred to; force copying here. |