summaryrefslogtreecommitdiffstats
path: root/chrome/browser/favicon
diff options
context:
space:
mode:
authorsimon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 09:51:31 +0000
committersimon.hong81@gmail.com <simon.hong81@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 09:51:31 +0000
commitebbccb958d7979daaaac0230e6d4e785829be173 (patch)
treee95d888f26a8a649c773fc16bbbc8d5e0adf0463 /chrome/browser/favicon
parentc149b9198168ca08da0a30d4fb63f0eb232d6001 (diff)
downloadchromium_src-ebbccb958d7979daaaac0230e6d4e785829be173.zip
chromium_src-ebbccb958d7979daaaac0230e6d4e785829be173.tar.gz
chromium_src-ebbccb958d7979daaaac0230e6d4e785829be173.tar.bz2
Move RefCountedBytes Class to base namespace.
BUG=none TEST=compiles and tests pass on trybots Review URL: http://codereview.chromium.org/10083022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/favicon')
-rw-r--r--chrome/browser/favicon/favicon_handler_unittest.cc14
-rw-r--r--chrome/browser/favicon/favicon_service.h1
2 files changed, 7 insertions, 8 deletions
diff --git a/chrome/browser/favicon/favicon_handler_unittest.cc b/chrome/browser/favicon/favicon_handler_unittest.cc
index f06312f..bdfdcbb 100644
--- a/chrome/browser/favicon/favicon_handler_unittest.cc
+++ b/chrome/browser/favicon/favicon_handler_unittest.cc
@@ -328,7 +328,7 @@ TEST_F(FaviconHandlerTest, GetFaviconFromHistory) {
history_handler->favicon_data_.icon_type = history::FAVICON;
history_handler->favicon_data_.expired = false;
history_handler->favicon_data_.icon_url = icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
@@ -445,7 +445,7 @@ TEST_F(FaviconHandlerTest, UpdateAndDownloadFavicon) {
history_handler->favicon_data_.icon_type = history::FAVICON;
history_handler->favicon_data_.expired = false;
history_handler->favicon_data_.icon_url = icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
@@ -535,7 +535,7 @@ TEST_F(FaviconHandlerTest, UpdateFavicon) {
history_handler->favicon_data_.icon_type = history::FAVICON;
history_handler->favicon_data_.expired = false;
history_handler->favicon_data_.icon_url = icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
@@ -679,7 +679,7 @@ TEST_F(FaviconHandlerTest, Download2ndFaviconURLCandidate) {
history_handler->favicon_data_.icon_type = history::TOUCH_ICON;
history_handler->favicon_data_.expired = true;
history_handler->favicon_data_.icon_url = new_icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
history_handler->InvokeCallback();
@@ -808,7 +808,7 @@ TEST_F(FaviconHandlerTest, UpdateDuringDownloading) {
handler->favicon_data_.expired = false;
handler->favicon_data_.icon_type = history::TOUCH_ICON;
handler->favicon_data_.icon_url = latest_icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
handler->favicon_data_.image_data = data;
@@ -840,7 +840,7 @@ TEST_F(FaviconHandlerTest, MultipleFavicon) {
history_handler->favicon_data_.icon_type = history::FAVICON;
history_handler->favicon_data_.expired = false;
history_handler->favicon_data_.icon_url = icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
@@ -915,7 +915,7 @@ TEST_F(FaviconHandlerTest, FirstFavicon) {
history_handler->favicon_data_.icon_type = history::FAVICON;
history_handler->favicon_data_.expired = false;
history_handler->favicon_data_.icon_url = icon_url;
- scoped_refptr<RefCountedBytes> data = new RefCountedBytes();
+ scoped_refptr<base::RefCountedBytes> data = new base::RefCountedBytes();
FillBitmap(gfx::kFaviconSize, gfx::kFaviconSize, &data->data());
history_handler->favicon_data_.image_data = data;
diff --git a/chrome/browser/favicon/favicon_service.h b/chrome/browser/favicon/favicon_service.h
index 2375c1c..f471edb 100644
--- a/chrome/browser/favicon/favicon_service.h
+++ b/chrome/browser/favicon/favicon_service.h
@@ -10,7 +10,6 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/ref_counted_memory.h"
#include "chrome/browser/cancelable_request.h"
#include "chrome/browser/history/history_types.h"
#include "chrome/common/ref_counted_util.h"