diff options
author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 13:29:33 +0000 |
---|---|---|
committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-07 13:29:33 +0000 |
commit | 59e6b80fe7242316d3abb6455d7cf0dc523c18f2 (patch) | |
tree | cd76c4f3c8d3bde1cc201bd7be603c796f58412c /google_apis | |
parent | 0e9283c5d5b9079c6b02c9426f07d2999fb4f7fb (diff) | |
download | chromium_src-59e6b80fe7242316d3abb6455d7cf0dc523c18f2.zip chromium_src-59e6b80fe7242316d3abb6455d7cf0dc523c18f2.tar.gz chromium_src-59e6b80fe7242316d3abb6455d7cf0dc523c18f2.tar.bz2 |
Linux/ChromeOS Chromium style checker cleanup, assorted top directories edition.
Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.
BUG=115047
TBR=miket
Review URL: https://chromiumcodereview.appspot.com/12245003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181292 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
-rw-r--r-- | google_apis/gaia/gaia_authenticator_unittest.cc | 13 | ||||
-rw-r--r-- | google_apis/gaia/gaia_oauth_client_unittest.cc | 6 | ||||
-rw-r--r-- | google_apis/google_api_keys_unittest.cc | 4 |
3 files changed, 13 insertions, 10 deletions
diff --git a/google_apis/gaia/gaia_authenticator_unittest.cc b/google_apis/gaia/gaia_authenticator_unittest.cc index 8f63193..50cb25a 100644 --- a/google_apis/gaia/gaia_authenticator_unittest.cc +++ b/google_apis/gaia/gaia_authenticator_unittest.cc @@ -20,17 +20,20 @@ class GaiaAuthMockForGaiaAuthenticator : public GaiaAuthenticator { public: GaiaAuthMockForGaiaAuthenticator() : GaiaAuthenticator("useragent", "serviceid", "http://gaia_url") {} - ~GaiaAuthMockForGaiaAuthenticator() {} + virtual ~GaiaAuthMockForGaiaAuthenticator() {} protected: - bool Post(const GURL& url, const string& post_body, - unsigned long* response_code, string* response_body) { + virtual bool Post( + const GURL& url, + const string& post_body, + unsigned long* response_code, + string* response_body) OVERRIDE { *response_code = net::HTTP_OK; response_body->assign("body\n"); return true; } - int GetBackoffDelaySeconds( - int current_backoff_delay) { + virtual int GetBackoffDelaySeconds( + int current_backoff_delay) OVERRIDE { // Dummy delay value. return 5; } diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc index f21a395..9c87a16 100644 --- a/google_apis/gaia/gaia_oauth_client_unittest.cc +++ b/google_apis/gaia/gaia_oauth_client_unittest.cc @@ -42,7 +42,7 @@ class MockOAuthFetcher : public net::TestURLFetcher { virtual ~MockOAuthFetcher() { } - virtual void Start() { + virtual void Start() OVERRIDE { if ((GetResponseCode() != net::HTTP_OK) && (max_failure_count_ != -1) && (current_failure_count_ == max_failure_count_)) { set_response_code(net::HTTP_OK); @@ -71,12 +71,12 @@ class MockOAuthFetcherFactory : public net::URLFetcherFactory, : net::ScopedURLFetcherFactory(ALLOW_THIS_IN_INITIALIZER_LIST(this)), response_code_(net::HTTP_OK) { } - ~MockOAuthFetcherFactory() {} + virtual ~MockOAuthFetcherFactory() {} virtual net::URLFetcher* CreateURLFetcher( int id, const GURL& url, net::URLFetcher::RequestType request_type, - net::URLFetcherDelegate* d) { + net::URLFetcherDelegate* d) OVERRIDE { return new MockOAuthFetcher( response_code_, max_failure_count_, diff --git a/google_apis/google_api_keys_unittest.cc b/google_apis/google_api_keys_unittest.cc index 8d1c036..ab50d3f 100644 --- a/google_apis/google_api_keys_unittest.cc +++ b/google_apis/google_api_keys_unittest.cc @@ -63,7 +63,7 @@ class GoogleAPIKeysTest : public testing::Test { env_cache_[8].variable_name = "GOOGLE_DEFAULT_CLIENT_SECRET"; } - void SetUp() { + virtual void SetUp() { // Unset all environment variables that can affect these tests, // for the duration of the tests. for (size_t i = 0; i < arraysize(env_cache_); ++i) { @@ -77,7 +77,7 @@ class GoogleAPIKeysTest : public testing::Test { } } - void TearDown() { + virtual void TearDown() { // Restore environment. for (size_t i = 0; i < arraysize(env_cache_); ++i) { EnvironmentCache& cache = env_cache_[i]; |