summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 00:55:19 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 00:55:19 +0000
commitb52e339dfcfa1e575cf7f4ceca77695f739724cd (patch)
tree91770b7a3253310dfde3663a463dd63e622c483a
parent164d6d5af9a0520745f913de574e889f8a944210 (diff)
downloadchromium_src-b52e339dfcfa1e575cf7f4ceca77695f739724cd.zip
chromium_src-b52e339dfcfa1e575cf7f4ceca77695f739724cd.tar.gz
chromium_src-b52e339dfcfa1e575cf7f4ceca77695f739724cd.tar.bz2
Fix for the Android build that does not compile.
BUG=None TEST=Unit-tests should compile on Android. Review URL: http://codereview.chromium.org/10378020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135506 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/history/android/favicon_sql_handler.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/history/android/favicon_sql_handler.cc b/chrome/browser/history/android/favicon_sql_handler.cc
index d3c49b0..b52aef4 100644
--- a/chrome/browser/history/android/favicon_sql_handler.cc
+++ b/chrome/browser/history/android/favicon_sql_handler.cc
@@ -5,6 +5,8 @@
#include "chrome/browser/history/android/favicon_sql_handler.h"
#include "base/logging.h"
+#include "base/memory/ref_counted.h"
+#include "base/memory/ref_counted_memory.h"
#include "chrome/browser/history/thumbnail_database.h"
using base::Time;
@@ -37,7 +39,7 @@ bool FaviconSQLHandler::Update(const HistoryAndBookmarkRow& row,
if (!favicon_id)
return false;
- scoped_refptr<RefCountedMemory> image_data =
+ scoped_refptr<base::RefCountedMemory> image_data =
new base::RefCountedBytes(row.favicon());
if (!thumbnail_db_->SetFavicon(favicon_id, image_data, Time::Now()))
return false;
@@ -113,7 +115,7 @@ bool FaviconSQLHandler::Insert(HistoryAndBookmarkRow* row) {
if (!id)
return false;
- scoped_refptr<RefCountedMemory> image_data =
+ scoped_refptr<base::RefCountedMemory> image_data =
new base::RefCountedBytes(row->favicon());
if (!thumbnail_db_->SetFavicon(id, image_data, Time::Now()))
return false;