| Index: chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
|
| index 6eb63e422320b5b5d3494957037c33a66bdc2c71..b90f73b5afa41eae57e3c3f9616533faf09b9c77 100644
|
| --- a/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
|
| +++ b/chrome/browser/chromeos/app_mode/kiosk_app_manager_browsertest.cc
|
| @@ -113,7 +113,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
|
| manager_->AddObserver(this);
|
| }
|
|
|
| - virtual ~AppDataLoadWaiter() { manager_->RemoveObserver(this); }
|
| + ~AppDataLoadWaiter() override { manager_->RemoveObserver(this); }
|
|
|
| void Wait() {
|
| if (quit_)
|
| @@ -126,7 +126,7 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
|
|
|
| private:
|
| // KioskAppManagerObserver overrides:
|
| - virtual void OnKioskAppDataChanged(const std::string& app_id) override {
|
| + void OnKioskAppDataChanged(const std::string& app_id) override {
|
| ++data_change_count_;
|
| if (data_change_count_ < data_loaded_threshold_)
|
| return;
|
| @@ -136,20 +136,18 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
|
| runner_->Quit();
|
| }
|
|
|
| - virtual void OnKioskAppDataLoadFailure(const std::string& app_id) override {
|
| + void OnKioskAppDataLoadFailure(const std::string& app_id) override {
|
| loaded_ = false;
|
| quit_ = true;
|
| if (runner_.get())
|
| runner_->Quit();
|
| }
|
|
|
| - virtual void OnKioskExtensionLoadedInCache(
|
| - const std::string& app_id) override {
|
| + void OnKioskExtensionLoadedInCache(const std::string& app_id) override {
|
| OnKioskAppDataChanged(app_id);
|
| }
|
|
|
| - virtual void OnKioskExtensionDownloadFailed(
|
| - const std::string& app_id) override {
|
| + void OnKioskExtensionDownloadFailed(const std::string& app_id) override {
|
| OnKioskAppDataLoadFailure(app_id);
|
| }
|
|
|
| @@ -168,10 +166,10 @@ class AppDataLoadWaiter : public KioskAppManagerObserver {
|
| class KioskAppManagerTest : public InProcessBrowserTest {
|
| public:
|
| KioskAppManagerTest() : fake_cws_(new FakeCWS()) {}
|
| - virtual ~KioskAppManagerTest() {}
|
| + ~KioskAppManagerTest() override {}
|
|
|
| // InProcessBrowserTest overrides:
|
| - virtual void SetUp() override {
|
| + void SetUp() override {
|
| base::FilePath test_data_dir;
|
| PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
|
| embedded_test_server()->ServeFilesFromDirectory(test_data_dir);
|
| @@ -185,21 +183,21 @@ class KioskAppManagerTest : public InProcessBrowserTest {
|
| InProcessBrowserTest::SetUp();
|
| }
|
|
|
| - virtual void SetUpCommandLine(base::CommandLine* command_line) override {
|
| + void SetUpCommandLine(base::CommandLine* command_line) override {
|
| InProcessBrowserTest::SetUpCommandLine(command_line);
|
|
|
| // Initialize fake_cws_ to setup web store gallery.
|
| fake_cws_->Init(embedded_test_server());
|
| }
|
|
|
| - virtual void SetUpOnMainThread() override {
|
| + void SetUpOnMainThread() override {
|
| InProcessBrowserTest::SetUpOnMainThread();
|
|
|
| // Restart the thread as the sandbox host process has already been spawned.
|
| embedded_test_server()->RestartThreadAndListen();
|
| }
|
|
|
| - virtual void SetUpInProcessBrowserTestFixture() override {
|
| + void SetUpInProcessBrowserTestFixture() override {
|
| InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
|
|
|
| host_resolver()->AddRule("*", "127.0.0.1");
|
|
|