Replacing the OVERRIDE with override and FINAL with final in content/browser/[devtools/ssl]

content/browser/devtools/devtools_manager_unittest.cc

 // Copyright (c) 2012 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 "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "content/browser/devtools/devtools_manager.h"
 #include "content/browser/devtools/embedded_worker_devtools_manager.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
@@ skipping 30 matching lines @@
   }
 
   void Close() {
     EXPECT_FALSE(closed_);
     close_counter++;
     agent_host_->DetachClient();
     closed_ = true;
   }
 
   virtual void AgentHostClosed(
-      DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
+      DevToolsAgentHost* agent_host, bool replaced) override {
     FAIL();
   }
 
   virtual void DispatchProtocolMessage(
-      DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
+      DevToolsAgentHost* agent_host, const std::string& message) override {
     last_sent_message = &message;
   }
 
   void InspectAgentHost(DevToolsAgentHost* agent_host) {
     agent_host_ = agent_host;
     agent_host_->AttachClient(this);
   }
 
   DevToolsAgentHost* agent_host() { return agent_host_.get(); }
 
@@ skipping 13 matching lines @@
 };
 
 int TestDevToolsClientHost::close_counter = 0;
 
 
 class TestWebContentsDelegate : public WebContentsDelegate {
  public:
   TestWebContentsDelegate() : renderer_unresponsive_received_(false) {}
 
   // Notification that the contents is hung.
-  virtual void RendererUnresponsive(WebContents* source) OVERRIDE {
+  virtual void RendererUnresponsive(WebContents* source) override {
     renderer_unresponsive_received_ = true;
   }
 
   bool renderer_unresponsive_received() const {
     return renderer_unresponsive_received_;
   }
 
  private:
   bool renderer_unresponsive_received_;
 };
 
 class TestTarget : public DevToolsTarget {
  public:
   explicit TestTarget(scoped_refptr<DevToolsAgentHost> agent_host)
       : agent_host_(agent_host) {}
   virtual ~TestTarget() {}
 
-  virtual std::string GetId() const OVERRIDE { return agent_host_->GetId(); }
-  virtual std::string GetParentId() const OVERRIDE { return std::string(); }
-  virtual std::string GetType() const OVERRIDE { return std::string(); }
-  virtual std::string GetTitle() const OVERRIDE {
+  virtual std::string GetId() const override { return agent_host_->GetId(); }
+  virtual std::string GetParentId() const override { return std::string(); }
+  virtual std::string GetType() const override { return std::string(); }
+  virtual std::string GetTitle() const override {
     return agent_host_->GetTitle();
   }
-  virtual std::string GetDescription() const OVERRIDE { return std::string(); }
-  virtual GURL GetURL() const OVERRIDE { return agent_host_->GetURL(); }
-  virtual GURL GetFaviconURL() const OVERRIDE { return GURL(); }
-  virtual base::TimeTicks GetLastActivityTime() const OVERRIDE {
+  virtual std::string GetDescription() const override { return std::string(); }
+  virtual GURL GetURL() const override { return agent_host_->GetURL(); }
+  virtual GURL GetFaviconURL() const override { return GURL(); }
+  virtual base::TimeTicks GetLastActivityTime() const override {
     return base::TimeTicks();
   }
-  virtual bool IsAttached() const OVERRIDE { return agent_host_->IsAttached(); }
-  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const OVERRIDE {
+  virtual bool IsAttached() const override { return agent_host_->IsAttached(); }
+  virtual scoped_refptr<DevToolsAgentHost> GetAgentHost() const override {
     return agent_host_;
   }
-  virtual bool Activate() const OVERRIDE { return agent_host_->Activate(); }
-  virtual bool Close() const OVERRIDE { return agent_host_->Close(); }
+  virtual bool Activate() const override { return agent_host_->Activate(); }
+  virtual bool Close() const override { return agent_host_->Close(); }
 
  private:
   scoped_refptr<DevToolsAgentHost> agent_host_;
 };
 
 class TestDevToolsManagerDelegate : public DevToolsManagerDelegate {
  public:
   virtual ~TestDevToolsManagerDelegate() {}
 
   virtual void Inspect(BrowserContext* browser_context,
-                       DevToolsAgentHost* agent_host) OVERRIDE {}
+                       DevToolsAgentHost* agent_host) override {}
 
   virtual void DevToolsAgentStateChanged(DevToolsAgentHost* agent_host,
-                                         bool attached) OVERRIDE {}
+                                         bool attached) override {}
 
   virtual base::DictionaryValue* HandleCommand(
       DevToolsAgentHost* agent_host,
-      base::DictionaryValue* command) OVERRIDE { return NULL; }
+      base::DictionaryValue* command) override { return NULL; }
 
-  virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) OVERRIDE {
+  virtual scoped_ptr<DevToolsTarget> CreateNewTarget(const GURL& url) override {
     return scoped_ptr<DevToolsTarget>();
   }
 
-  virtual void EnumerateTargets(TargetCallback callback) OVERRIDE {
+  virtual void EnumerateTargets(TargetCallback callback) override {
     TargetList result;
     DevToolsAgentHost::List agents = DevToolsAgentHost::GetOrCreateAll();
     for (DevToolsAgentHost::List::iterator it = agents.begin();
          it != agents.end(); ++it) {
       if ((*it)->GetType() == DevToolsAgentHost::TYPE_WEB_CONTENTS)
         result.insert(result.begin(), new TestTarget(*it));
       else
         result.push_back(new TestTarget(*it));
     }
     callback.Run(result);
   }
 
-  virtual std::string GetPageThumbnailData(const GURL& url) OVERRIDE {
+  virtual std::string GetPageThumbnailData(const GURL& url) override {
     return std::string();
   }
 };
 
 class ContentBrowserClientWithDevTools : public TestContentBrowserClient {
  public:
   virtual ~ContentBrowserClientWithDevTools() {}
   virtual content::DevToolsManagerDelegate*
-      GetDevToolsManagerDelegate() OVERRIDE {
+      GetDevToolsManagerDelegate() override {
     return new TestDevToolsManagerDelegate();
   }
 };
 
 class TestDevToolsManagerObserver : public DevToolsManager::Observer {
  public:
   TestDevToolsManagerObserver()
       : updates_count_(0) {}
   virtual ~TestDevToolsManagerObserver() {}
 
   int updates_count() { return updates_count_; }
   const std::vector<scoped_refptr<DevToolsAgentHost>> hosts() {
     return hosts_;
   }
 
-  virtual void TargetListChanged(const TargetList& targets) OVERRIDE {
+  virtual void TargetListChanged(const TargetList& targets) override {
     updates_count_++;
     hosts_.clear();
     for (TargetList::const_iterator it = targets.begin();
          it != targets.end(); ++it) {
       hosts_.push_back((*it)->GetAgentHost());
     }
   }
 
  private:
   int updates_count_;
   std::vector<scoped_refptr<DevToolsAgentHost>> hosts_;
 };
 
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostImplTestHarness {
  public:
   DevToolsManagerTest()
       : old_browser_client_(NULL) {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     RenderViewHostImplTestHarness::SetUp();
     TestDevToolsClientHost::ResetCounters();
     old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     SetBrowserClientForTesting(old_browser_client_);
     RenderViewHostImplTestHarness::TearDown();
   }
 
   ContentBrowserClientWithDevTools browser_client_;
   ContentBrowserClient* old_browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   scoped_refptr<DevToolsAgentHost> agent(
@@ skipping 86 matching lines @@
   void recordEvent(const std::string& name) {
     if (event_counter_.find(name) == event_counter_.end())
       event_counter_[name] = 0;
     event_counter_[name] = event_counter_[name] + 1;
   }
 
   void expectEvent(int count, const std::string& name) {
     EXPECT_EQ(count, event_counter_[name]);
   }
 
-  virtual void Attach(DevToolsExternalAgentProxy* proxy) OVERRIDE {
+  virtual void Attach(DevToolsExternalAgentProxy* proxy) override {
     recordEvent("Attach");
   };
 
-  virtual void Detach() OVERRIDE {
+  virtual void Detach() override {
     recordEvent("Detach");
   };
 
-  virtual void SendMessageToBackend(const std::string& message) OVERRIDE {
+  virtual void SendMessageToBackend(const std::string& message) override {
     recordEvent(std::string("SendMessageToBackend.") + message);
   };
 
  public :
   virtual ~TestExternalAgentDelegate() {
     expectEvent(1, "Attach");
     expectEvent(1, "Detach");
     expectEvent(0, "SendMessageToBackend.message0");
     expectEvent(1, "SendMessageToBackend.message1");
     expectEvent(2, "SendMessageToBackend.message2");
@@ skipping 116 matching lines @@
   EXPECT_TRUE(scheduler.IsEmpty());
   EXPECT_EQ(4, observer->updates_count());
 
   manager->RemoveObserver(observer.get());
 
   EXPECT_TRUE(scheduler.IsEmpty());
   manager->SetSchedulerForTest(DevToolsManager::Scheduler());
 }
 
 }  // namespace content