| Index: chrome/test/ppapi/ppapi_test.h
|
| diff --git a/chrome/test/ppapi/ppapi_test.h b/chrome/test/ppapi/ppapi_test.h
|
| index 9d6c209e36b799cfcff864d6a093043fa534ccb3..8d71b502a8ee0d827abdafcdd08610559f84e464 100644
|
| --- a/chrome/test/ppapi/ppapi_test.h
|
| +++ b/chrome/test/ppapi/ppapi_test.h
|
| @@ -21,8 +21,8 @@ class PPAPITestMessageHandler : public content::TestMessageHandler {
|
| public:
|
| PPAPITestMessageHandler();
|
|
|
| - virtual MessageResponse HandleMessage(const std::string& json) OVERRIDE;
|
| - virtual void Reset() OVERRIDE;
|
| + virtual MessageResponse HandleMessage(const std::string& json) override;
|
| + virtual void Reset() override;
|
|
|
| const std::string& message() const {
|
| return message_;
|
| @@ -39,9 +39,9 @@ class PPAPITestBase : public InProcessBrowserTest {
|
| PPAPITestBase();
|
|
|
| // InProcessBrowserTest:
|
| - virtual void SetUp() OVERRIDE;
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| - virtual void SetUpOnMainThread() OVERRIDE;
|
| + virtual void SetUp() override;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| + virtual void SetUpOnMainThread() override;
|
|
|
| virtual std::string BuildQuery(const std::string& base,
|
| const std::string& test_case) = 0;
|
| @@ -68,7 +68,7 @@ class PPAPITestBase : public InProcessBrowserTest {
|
| // content::NotificationObserver:
|
| virtual void Observe(int type,
|
| const content::NotificationSource& source,
|
| - const content::NotificationDetails& details) OVERRIDE;
|
| + const content::NotificationDetails& details) override;
|
|
|
| void VerifyInfoBarState();
|
|
|
| @@ -94,17 +94,17 @@ class PPAPITest : public PPAPITestBase {
|
| public:
|
| PPAPITest();
|
|
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
|
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| protected:
|
| bool in_process_; // Controls the --ppapi-in-process switch.
|
| };
|
|
|
| class PPAPIPrivateTest : public PPAPITest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| // Variant of PPAPITest that runs plugins out-of-process to test proxy
|
| @@ -113,65 +113,65 @@ class OutOfProcessPPAPITest : public PPAPITest {
|
| public:
|
| OutOfProcessPPAPITest();
|
|
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| class OutOfProcessPPAPIPrivateTest : public OutOfProcessPPAPITest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| // NaCl plugin test runner for Newlib runtime.
|
| class PPAPINaClTest : public PPAPITestBase {
|
| public:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| - virtual void SetUpOnMainThread() OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| + virtual void SetUpOnMainThread() override;
|
| // PPAPITestBase overrides.
|
| - virtual void RunTest(const std::string& test_case) OVERRIDE;
|
| - virtual void RunTestViaHTTP(const std::string& test_case) OVERRIDE;
|
| - virtual void RunTestWithSSLServer(const std::string& test_case) OVERRIDE;
|
| + virtual void RunTest(const std::string& test_case) override;
|
| + virtual void RunTestViaHTTP(const std::string& test_case) override;
|
| + virtual void RunTestWithSSLServer(const std::string& test_case) override;
|
| virtual void RunTestWithWebSocketServer(
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| virtual void RunTestIfAudioOutputAvailable(
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| virtual void RunTestViaHTTPIfAudioOutputAvailable(
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| // NaCl plugin test runner for Newlib runtime.
|
| class PPAPINaClNewlibTest : public PPAPINaClTest {
|
| public:
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| class PPAPIPrivateNaClNewlibTest : public PPAPINaClNewlibTest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| // NaCl plugin test runner for GNU-libc runtime.
|
| class PPAPINaClGLibcTest : public PPAPINaClTest {
|
| public:
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| class PPAPIPrivateNaClGLibcTest : public PPAPINaClGLibcTest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| // NaCl plugin test runner for the PNaCl + Newlib runtime.
|
| class PPAPINaClPNaClTest : public PPAPINaClTest {
|
| public:
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| class PPAPIPrivateNaClPNaClTest : public PPAPINaClPNaClTest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| // Test Non-SFI Mode, using PNaCl toolchain to produce nexes.
|
| @@ -180,26 +180,26 @@ class PPAPINaClPNaClNonSfiTest : public PPAPINaClTest {
|
| virtual void SetUpCommandLine(base::CommandLine* command_line);
|
|
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| class PPAPIPrivateNaClPNaClNonSfiTest : public PPAPINaClPNaClNonSfiTest {
|
| protected:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
| };
|
|
|
| class PPAPINaClTestDisallowedSockets : public PPAPITestBase {
|
| public:
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
|
| + virtual void SetUpCommandLine(base::CommandLine* command_line) override;
|
|
|
| virtual std::string BuildQuery(const std::string& base,
|
| - const std::string& test_case) OVERRIDE;
|
| + const std::string& test_case) override;
|
| };
|
|
|
| class PPAPIBrokerInfoBarTest : public OutOfProcessPPAPITest {
|
| public:
|
| // PPAPITestBase override:
|
| - virtual void SetUpOnMainThread() OVERRIDE;
|
| + virtual void SetUpOnMainThread() override;
|
| };
|
|
|
| #endif // CHROME_TEST_PPAPI_PPAPI_TEST_H_
|
|
|