summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-12 02:08:01 +0000
commitc3e3589c3e2dd1bc2e80d708fd49414376b2da8e (patch)
treeb024190741fb05211f5d8f600bb93c0237b0eed3 /content/test
parent3b22093c5ea7fd343be8d40f6e229ca7e4eaef8c (diff)
downloadchromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.zip
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.gz
chromium_src-c3e3589c3e2dd1bc2e80d708fd49414376b2da8e.tar.bz2
Linux/ChromeOS Chromium style checker cleanup, content/ 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://chromiumcodereview.appspot.com/12210030 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181822 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/gpu/gpu_test_config_unittest.cc4
-rw-r--r--content/test/gpu/gpu_test_expectations_parser_unittest.cc4
-rw-r--r--content/test/net/url_request_prepackaged_interceptor.cc2
-rw-r--r--content/test/webrtc_audio_device_test.cc8
4 files changed, 10 insertions, 8 deletions
diff --git a/content/test/gpu/gpu_test_config_unittest.cc b/content/test/gpu/gpu_test_config_unittest.cc
index 5abcfdb..f58139f 100644
--- a/content/test/gpu/gpu_test_config_unittest.cc
+++ b/content/test/gpu/gpu_test_config_unittest.cc
@@ -13,9 +13,9 @@ class GPUTestConfigTest : public testing::Test {
virtual ~GPUTestConfigTest() { }
protected:
- void SetUp() { }
+ virtual void SetUp() { }
- void TearDown() { }
+ virtual void TearDown() { }
};
TEST_F(GPUTestConfigTest, EmptyValues) {
diff --git a/content/test/gpu/gpu_test_expectations_parser_unittest.cc b/content/test/gpu/gpu_test_expectations_parser_unittest.cc
index 0651f24..f5f3d95 100644
--- a/content/test/gpu/gpu_test_expectations_parser_unittest.cc
+++ b/content/test/gpu/gpu_test_expectations_parser_unittest.cc
@@ -17,7 +17,7 @@ class GPUTestExpectationsParserTest : public testing::Test {
}
protected:
- void SetUp() {
+ virtual void SetUp() {
bot_config_.set_os(GPUTestConfig::kOsWin7);
bot_config_.set_build_type(GPUTestConfig::kBuildTypeRelease);
bot_config_.AddGPUVendor(0x10de);
@@ -25,7 +25,7 @@ class GPUTestExpectationsParserTest : public testing::Test {
ASSERT_TRUE(bot_config_.IsValid());
}
- void TearDown() { }
+ virtual void TearDown() { }
private:
GPUTestBotConfig bot_config_;
diff --git a/content/test/net/url_request_prepackaged_interceptor.cc b/content/test/net/url_request_prepackaged_interceptor.cc
index 11ad222..f8603ef 100644
--- a/content/test/net/url_request_prepackaged_interceptor.cc
+++ b/content/test/net/url_request_prepackaged_interceptor.cc
@@ -25,7 +25,7 @@ class URLRequestPrepackagedJob : public net::URLRequestFileJob {
const base::FilePath& file_path)
: net::URLRequestFileJob(request, network_delegate, file_path) {}
- virtual int GetResponseCode() const { return 200; }
+ virtual int GetResponseCode() const OVERRIDE { return 200; }
private:
virtual ~URLRequestPrepackagedJob() {}
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 13f79c8..e9a3c48 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -62,9 +62,11 @@ class WebRTCMockRenderProcess : public RenderProcess {
virtual void ReleaseTransportDIB(TransportDIB* memory) OVERRIDE {}
virtual bool UseInProcessPlugins() const OVERRIDE { return false; }
virtual void AddBindings(int bindings) OVERRIDE {}
- virtual int GetEnabledBindings() const { return 0; }
- virtual TransportDIB* CreateTransportDIB(size_t size) { return NULL; }
- virtual void FreeTransportDIB(TransportDIB*) {}
+ virtual int GetEnabledBindings() const OVERRIDE { return 0; }
+ virtual TransportDIB* CreateTransportDIB(size_t size) OVERRIDE {
+ return NULL;
+ }
+ virtual void FreeTransportDIB(TransportDIB*) OVERRIDE {}
private:
DISALLOW_COPY_AND_ASSIGN(WebRTCMockRenderProcess);