[M49_2623] Chromium upversion to m49_2623 branch.

[platform/framework/web/chromium-efl.git] / tizen_src / ewk / efl_integration / devtools_delegate_efl.cc

diff --git a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
index 2d4e67a..dd0efde 100644 (file)
--- a/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc
@@ -42,14 +42,14 @@ namespace {
 // Copy of internal class implementation from
 // content/shell/browser/shell_devtools_delegate.cc
 
-const uint16 kMinTetheringPort = 9333;
-const uint16 kMaxTetheringPort = 9444;
+const uint16_t kMinTetheringPort = 9333;
+const uint16_t kMaxTetheringPort = 9444;
 const int kBackLog = 10;
 
 class TCPServerSocketFactory
     : public DevToolsHttpHandler::ServerSocketFactory {
  public:
-  TCPServerSocketFactory(const std::string& address, uint16 port)
+  TCPServerSocketFactory(const std::string& address, uint16_t port)
       : address_(address),
         port_(port) {}
 
@@ -64,7 +64,7 @@ class TCPServerSocketFactory
   }
 
   std::string address_;
-  uint16 port_;
+  uint16_t port_;
 };
 
 }  // namespace
@@ -111,12 +111,11 @@ DevToolsDelegateEfl::DevToolsDelegateEfl(int port)
   scoped_ptr<DevToolsHttpHandler::ServerSocketFactory> factory(
       new TCPServerSocketFactory(addr, port_));
 
-  devtools_http_handler_.reset(
-    new devtools_http_handler::DevToolsHttpHandler(factory.Pass(),
-       std::string(), this, base::FilePath(),
-       base::FilePath(),
-       EflWebView::VersionInfo::GetInstance()->ProductNameAndVersionForUserAgent(),
-       EflWebView::VersionInfo::GetInstance()->DefaultUserAgent()));
+  devtools_http_handler_.reset(new devtools_http_handler::DevToolsHttpHandler(
+      std::move(factory), std::string(), this, base::FilePath(),
+      base::FilePath(), EflWebView::VersionInfo::GetInstance()
+                            ->ProductNameAndVersionForUserAgent(),
+      EflWebView::VersionInfo::GetInstance()->DefaultUserAgent()));
 }
 
 DevToolsDelegateEfl::~DevToolsDelegateEfl() {