Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / test / chromedriver / chrome / heap_snapshot_taker_unittest.cc

diff --git a/src/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc b/src/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
index 2c73ea0..0301efa 100644 (file)
--- a/src/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
+++ b/src/chrome/test/chromedriver/chrome/heap_snapshot_taker_unittest.cc
@@ -14,13 +14,13 @@
 
 namespace {
 
-const char* chunks[] = {"{\"a\": 1,", "\"b\": 2}"};
+const char* const chunks[] = {"{\"a\": 1,", "\"b\": 2}"};
 
 scoped_ptr<base::Value> GetSnapshotAsValue() {
   scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue());
   dict->SetInteger("a", 1);
   dict->SetInteger("b", 2);
-  return dict.PassAs<base::Value>();
+  return dict.Pass();
 }
 
 class DummyDevToolsClient : public StubDevToolsClient {
@@ -30,7 +30,7 @@ class DummyDevToolsClient : public StubDevToolsClient {
         error_after_events_(error_after_events),
         uid_(1),
         disabled_(false) {}
-  virtual ~DummyDevToolsClient() {}
+  ~DummyDevToolsClient() override {}
 
   bool IsDisabled() { return disabled_; }
 
@@ -48,8 +48,8 @@ class DummyDevToolsClient : public StubDevToolsClient {
   }
 
   // Overridden from DevToolsClient:
-  virtual Status SendCommand(const std::string& method,
-                             const base::DictionaryValue& params) OVERRIDE {
+  Status SendCommand(const std::string& method,
+                     const base::DictionaryValue& params) override {
     if (!disabled_)
       disabled_ = method == "Debugger.disable";
     if (method == method_ && !error_after_events_)