summaryrefslogtreecommitdiffstats
path: root/extensions/shell/test
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 14:48:33 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 21:48:55 +0000
commit578ab408a9a10b59297b8364a50987a8dd088cdf (patch)
tree157fdfba308a708c7a1b2c62e5599aac8243003e /extensions/shell/test
parent67be2b1f8dbb8fe664365ce33cd6ccf2832e0663 (diff)
downloadchromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.zip
chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.gz
chromium_src-578ab408a9a10b59297b8364a50987a8dd088cdf.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=yoz@chromium.org Review URL: https://codereview.chromium.org/667153007 Cr-Commit-Position: refs/heads/master@{#301453}
Diffstat (limited to 'extensions/shell/test')
-rw-r--r--extensions/shell/test/shell_apitest.h2
-rw-r--r--extensions/shell/test/shell_test.h4
-rw-r--r--extensions/shell/test/shell_test_launcher_delegate.h6
3 files changed, 6 insertions, 6 deletions
diff --git a/extensions/shell/test/shell_apitest.h b/extensions/shell/test/shell_apitest.h
index 6eb0cb0..3688384 100644
--- a/extensions/shell/test/shell_apitest.h
+++ b/extensions/shell/test/shell_apitest.h
@@ -16,7 +16,7 @@ namespace extensions {
class ShellApiTest : public AppShellTest {
public:
ShellApiTest();
- virtual ~ShellApiTest();
+ ~ShellApiTest() override;
// Loads an unpacked platform app from a directory using the current
// ExtensionSystem, launches it, and waits for a chrome.test success
diff --git a/extensions/shell/test/shell_test.h b/extensions/shell/test/shell_test.h
index 286299d..fab2d15 100644
--- a/extensions/shell/test/shell_test.h
+++ b/extensions/shell/test/shell_test.h
@@ -25,10 +25,10 @@ class ShellExtensionSystem;
class AppShellTest : public content::BrowserTestBase {
public:
AppShellTest();
- virtual ~AppShellTest();
+ ~AppShellTest() override;
// content::BrowserTestBase implementation.
- virtual void SetUp() override;
+ void SetUp() override;
void SetUpOnMainThread() override;
void RunTestOnMainThreadLoop() override;
diff --git a/extensions/shell/test/shell_test_launcher_delegate.h b/extensions/shell/test/shell_test_launcher_delegate.h
index c6fbfdf..58976db 100644
--- a/extensions/shell/test/shell_test_launcher_delegate.h
+++ b/extensions/shell/test/shell_test_launcher_delegate.h
@@ -11,11 +11,11 @@ namespace extensions {
class AppShellTestLauncherDelegate : public content::TestLauncherDelegate {
public:
- virtual int RunTestSuite(int argc, char** argv) override;
- virtual bool AdjustChildProcessCommandLine(
+ int RunTestSuite(int argc, char** argv) override;
+ bool AdjustChildProcessCommandLine(
base::CommandLine* command_line,
const base::FilePath& temp_data_dir) override;
- virtual content::ContentMainDelegate* CreateContentMainDelegate() override;
+ content::ContentMainDelegate* CreateContentMainDelegate() override;
};
} // namespace extensions