C++11 override style change for athena

athena/content/app_activity_unittest.cc

 /// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/app_activity.h"
 #include "athena/content/app_activity_registry.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/extensions/public/extensions_delegate.h"
@@ skipping 22 matching lines @@
 class TestAppActivity : public AppActivity {
  public:
   explicit TestAppActivity(const std::string& app_id)
       : AppActivity(app_id),
         view_(new views::View()),
         current_state_(ACTIVITY_VISIBLE) {
     app_activity_registry_ =
         AppRegistry::Get()->GetAppActivityRegistry(app_id, nullptr);
     app_activity_registry_->RegisterAppActivity(this);
   }
-  virtual ~TestAppActivity() {
+  ~TestAppActivity() override {
     app_activity_registry_->UnregisterAppActivity(this);
   }
 
   AppActivityRegistry* app_activity_registry() {
     return app_activity_registry_;
   }
 
   // Activity:
-  virtual ActivityViewModel* GetActivityViewModel() override {
-    return this;
-  }
-  virtual void SetCurrentState(Activity::ActivityState state) override {
+  ActivityViewModel* GetActivityViewModel() override { return this; }
+  void SetCurrentState(Activity::ActivityState state) override {
     current_state_ = state;
     if (state == ACTIVITY_UNLOADED)
       app_activity_registry_->Unload();
   }
-  virtual ActivityState GetCurrentState() override {
-    return current_state_;
-  }
-  virtual bool IsVisible() override {
-    return true;
-  }
-  virtual ActivityMediaState GetMediaState() override {
+  ActivityState GetCurrentState() override { return current_state_; }
+  bool IsVisible() override { return true; }
+  ActivityMediaState GetMediaState() override {
     return Activity::ACTIVITY_MEDIA_STATE_NONE;
   }
-  virtual aura::Window* GetWindow() override {
+  aura::Window* GetWindow() override {
     return view_->GetWidget()->GetNativeWindow();
   }
 
   // ActivityViewModel:
-  virtual void Init() override {}
-  virtual SkColor GetRepresentativeColor() const override { return 0; }
-  virtual base::string16 GetTitle() const override { return title_; }
-  virtual bool UsesFrame() const override { return true; }
-  virtual views::View* GetContentsView() override { return view_; }
-  virtual views::Widget* CreateWidget() override { return nullptr; }
-  virtual gfx::ImageSkia GetOverviewModeImage() override {
-    return gfx::ImageSkia();
-  }
+  void Init() override {}
+  SkColor GetRepresentativeColor() const override { return 0; }
+  base::string16 GetTitle() const override { return title_; }
+  bool UsesFrame() const override { return true; }
+  views::View* GetContentsView() override { return view_; }
+  views::Widget* CreateWidget() override { return nullptr; }
+  gfx::ImageSkia GetOverviewModeImage() override { return gfx::ImageSkia(); }
 
  private:
   // If known the registry which holds all activities for the associated app.
   AppActivityRegistry* app_activity_registry_;
 
   // The title of the activity.
   base::string16 title_;
 
   // Our view.
   views::View* view_;
 
   // The current state for this activity.
   ActivityState current_state_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAppActivity);
 };
 
 // An AppContentDelegateClass which we can query for call stats.
 class TestExtensionsDelegate : public ExtensionsDelegate {
  public:
   TestExtensionsDelegate() : unload_called_(0), restart_called_(0) {}
-  virtual ~TestExtensionsDelegate() {}
+  ~TestExtensionsDelegate() override {}
 
   int unload_called() const { return unload_called_; }
   int restart_called() const { return restart_called_; }
 
   // ExtensionsDelegate:
-  virtual content::BrowserContext* GetBrowserContext() const override {
+  content::BrowserContext* GetBrowserContext() const override {
     return nullptr;
   }
-  virtual const extensions::ExtensionSet& GetInstalledExtensions() override {
+  const extensions::ExtensionSet& GetInstalledExtensions() override {
     return extension_set_;
   }
   // Unload an application. Returns true when unloaded.
-  virtual bool UnloadApp(const std::string& app_id) override {
+  bool UnloadApp(const std::string& app_id) override {
     unload_called_++;
     // Since we did not close anything we let the framework clean up.
     return false;
   }
   // Restarts an application. Returns true when the restart was initiated.
-  virtual bool LaunchApp(const std::string& app_id) override {
+  bool LaunchApp(const std::string& app_id) override {
     restart_called_++;
     return true;
   }
-  virtual scoped_ptr<extensions::ExtensionInstallUI> CreateExtensionInstallUI()
+  scoped_ptr<extensions::ExtensionInstallUI> CreateExtensionInstallUI()
       override {
     return scoped_ptr<extensions::ExtensionInstallUI>();
   }
 
  private:
   int unload_called_;
   int restart_called_;
 
   extensions::ExtensionSet extension_set_;
 
   DISALLOW_COPY_AND_ASSIGN(TestExtensionsDelegate);
 };
 
 }  // namespace
 
 // Our testing base.
 class AppActivityTest : public AthenaTestBase {
  public:
   AppActivityTest() : test_extensions_delegate_(nullptr) {}
-  virtual ~AppActivityTest() {}
+  ~AppActivityTest() override {}
 
   // AthenaTestBase:
-  virtual void SetUp() override {
+  void SetUp() override {
     AthenaTestBase::SetUp();
     // Create and install our TestAppContentDelegate with instrumentation.
     ExtensionsDelegate::Shutdown();
     // The instance will be deleted by ExtensionsDelegate::Shutdown().
     test_extensions_delegate_ = new TestExtensionsDelegate();
   }
 
   // A function to create an Activity.
   TestAppActivity* CreateAppActivity(const std::string& app_id) {
     TestAppActivity* activity = new TestAppActivity(app_id);
@@ skipping 270 matching lines @@
   // However - the restart in this test framework does not really restart and
   // all objects should be still there..
   EXPECT_EQ(1, AppRegistry::Get()->NumberOfApplications());
   EXPECT_TRUE(app_activity_registry->unloaded_activity_proxy());
   Activity::Delete(app_activity_registry->unloaded_activity_proxy());
   EXPECT_EQ(0, AppRegistry::Get()->NumberOfApplications());
 }
 
 }  // namespace test
 }  // namespace athena