Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / android / dev_tools_server.cc

diff --git a/src/chrome/browser/android/dev_tools_server.cc b/src/chrome/browser/android/dev_tools_server.cc
index 3318a70..0667d5a 100644 (file)
--- a/src/chrome/browser/android/dev_tools_server.cc
+++ b/src/chrome/browser/android/dev_tools_server.cc
@@ -86,7 +86,7 @@ class TargetBase : public content::DevToolsTarget {
       : title_(base::UTF16ToUTF8(web_contents->GetTitle())),
         url_(web_contents->GetURL()),
         favicon_url_(GetFaviconURL(web_contents)),
-        last_activity_time_(web_contents->GetLastSelectedTime()) {
+        last_activity_time_(web_contents->GetLastActiveTime()) {
   }
 
   TargetBase(const base::string16& title, const GURL& url)
@@ -285,8 +285,7 @@ class DevToolsServerDelegate : public content::DevToolsHttpHandlerDelegate {
     if (top_sites) {
       scoped_refptr<base::RefCountedMemory> data;
       if (top_sites->GetPageThumbnail(url, false, &data))
-        return std::string(reinterpret_cast<const char*>(data->front()),
-                           data->size());
+        return std::string(data->front_as<char>(), data->size());
     }
     return "";
   }