| Index: chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
|
| index def38dd921a5d753609ce7e06b11392a0c102755..020c6552e2ef753a58e77bb387a18f062ec0eca9 100644
|
| --- a/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
|
| +++ b/chrome/browser/extensions/api/hotword_private/hotword_private_apitest.cc
|
| @@ -24,11 +24,9 @@ class MockHotwordService : public HotwordService {
|
| public:
|
| explicit MockHotwordService(Profile* profile)
|
| : HotwordService(profile), service_available_(true) {};
|
| - virtual ~MockHotwordService() {}
|
| + ~MockHotwordService() override {}
|
|
|
| - virtual bool IsServiceAvailable() override {
|
| - return service_available_;
|
| - }
|
| + bool IsServiceAvailable() override { return service_available_; }
|
|
|
| void setServiceAvailable(bool available) {
|
| service_available_ = available;
|
| @@ -38,7 +36,7 @@ class MockHotwordService : public HotwordService {
|
| return new MockHotwordService(static_cast<Profile*>(profile));
|
| }
|
|
|
| - virtual LaunchMode GetHotwordAudioVerificationLaunchMode() override {
|
| + LaunchMode GetHotwordAudioVerificationLaunchMode() override {
|
| return launch_mode_;
|
| }
|
|
|
| @@ -61,16 +59,14 @@ class MockHotwordClient : public HotwordClient {
|
| recognized_count_(0) {
|
| }
|
|
|
| - virtual ~MockHotwordClient() {}
|
| + ~MockHotwordClient() override {}
|
|
|
| - virtual void OnHotwordStateChanged(bool enabled) override {
|
| + void OnHotwordStateChanged(bool enabled) override {
|
| last_enabled_ = enabled;
|
| state_changed_count_++;
|
| }
|
|
|
| - virtual void OnHotwordRecognized() override {
|
| - recognized_count_++;
|
| - }
|
| + void OnHotwordRecognized() override { recognized_count_++; }
|
|
|
| bool last_enabled() const { return last_enabled_; }
|
| int state_changed_count() const { return state_changed_count_; }
|
| @@ -89,7 +85,7 @@ class HotwordPrivateApiTest : public ExtensionApiTest {
|
| HotwordPrivateApiTest() {}
|
| virtual ~HotwordPrivateApiTest() {}
|
|
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| ExtensionApiTest::SetUpCommandLine(command_line);
|
|
|
| // Whitelist the test extensions (which all share a common ID) to use
|
| @@ -98,7 +94,7 @@ class HotwordPrivateApiTest : public ExtensionApiTest {
|
| extensions::switches::kWhitelistedExtensionID, kHotwordTestExtensionId);
|
| }
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| ExtensionApiTest::SetUpOnMainThread();
|
|
|
| test_data_dir_ = test_data_dir_.AppendASCII("hotword_private");
|
|
|