Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / devtools / devtools_http_handler_unittest.cc

diff --git a/src/content/browser/devtools/devtools_http_handler_unittest.cc b/src/content/browser/devtools/devtools_http_handler_unittest.cc
index c0e6589..28630ea 100644 (file)
--- a/src/content/browser/devtools/devtools_http_handler_unittest.cc
+++ b/src/content/browser/devtools/devtools_http_handler_unittest.cc
@@ -28,25 +28,25 @@ class DummyServerSocket : public net::ServerSocket {
   DummyServerSocket() {}
 
   // net::ServerSocket "implementation"
-  virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
+  int Listen(const net::IPEndPoint& address, int backlog) override {
     return net::OK;
   }
 
-  virtual int ListenWithAddressAndPort(const std::string& ip_address,
-                                       int port,
-                                       int backlog) OVERRIDE {
+  int ListenWithAddressAndPort(const std::string& ip_address,
+                               int port,
+                               int backlog) override {
     return net::OK;
   }
 
-  virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
+  int GetLocalAddress(net::IPEndPoint* address) const override {
     net::IPAddressNumber number;
     EXPECT_TRUE(net::ParseIPLiteralToNumber("127.0.0.1", &number));
     *address = net::IPEndPoint(number, kDummyPort);
     return net::OK;
   }
 
-  virtual int Accept(scoped_ptr<net::StreamSocket>* socket,
-                     const net::CompletionCallback& callback) OVERRIDE {
+  int Accept(scoped_ptr<net::StreamSocket>* socket,
+             const net::CompletionCallback& callback) override {
     return net::ERR_IO_PENDING;
   }
 };
@@ -60,13 +60,13 @@ class DummyServerSocketFactory
         quit_closure_1_(quit_closure_1),
         quit_closure_2_(quit_closure_2) {}
 
-  virtual ~DummyServerSocketFactory() {
+  ~DummyServerSocketFactory() override {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, quit_closure_2_);
   }
 
  private:
-  virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
+  scoped_ptr<net::ServerSocket> Create() const override {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, quit_closure_1_);
     return scoped_ptr<net::ServerSocket>(new DummyServerSocket());
@@ -78,17 +78,15 @@ class DummyServerSocketFactory
 
 class DummyDelegate : public DevToolsHttpHandlerDelegate {
  public:
-  virtual std::string GetDiscoveryPageHTML() OVERRIDE { return std::string(); }
+  std::string GetDiscoveryPageHTML() override { return std::string(); }
 
-  virtual bool BundlesFrontendResources() OVERRIDE { return true; }
+  bool BundlesFrontendResources() override { return true; }
 
-  virtual base::FilePath GetDebugFrontendDir() OVERRIDE {
-    return base::FilePath();
-  }
+  base::FilePath GetDebugFrontendDir() override { return base::FilePath(); }
 
-  virtual scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
+  scoped_ptr<net::StreamListenSocket> CreateSocketForTethering(
       net::StreamListenSocket::Delegate* delegate,
-      std::string* name) OVERRIDE {
+      std::string* name) override {
     return scoped_ptr<net::StreamListenSocket>();
   }
 };
@@ -102,14 +100,12 @@ class DevToolsHttpHandlerTest : public testing::Test {
   }
 
  protected:
-  virtual void SetUp() {
+  void SetUp() override {
     file_thread_.reset(new BrowserThreadImpl(BrowserThread::FILE));
     file_thread_->Start();
   }
 
-  virtual void TearDown() {
-    file_thread_->Stop();
-  }
+  void TearDown() override { file_thread_->Stop(); }
 
  private:
   base::MessageLoopForIO message_loop_;