Export bookmark favicon (base64 encoded png).

Code for importing icons from bookmarks HTML file is already in place.

BUG=11362
TEST=Export bookmarks to HTML file, delete all existing bookmarks, import file.

Review URL: http://codereview.chromium.org/543202

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38362 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 10 insertions, 1 deletions

diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 59049b4..05db3a9 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -33,6 +33,9 @@ class TestingProfile : public Profile {
 
   virtual ~TestingProfile();
 
+  // Creates the favicon service. Consequent calls would recreate the service.
+  void CreateFaviconService();
+
   // Creates the history service. If |delete_file| is true, the history file is
   // deleted first, then the HistoryService is created. As TestingProfile
   // deletes the directory containing the files used by HistoryService, this
@@ -101,7 +104,7 @@ class TestingProfile : public Profile {
     return NULL;
   }
   virtual FaviconService* GetFaviconService(ServiceAccessType access) {
-    return NULL;
+    return favicon_service_.get();
   }
   virtual HistoryService* GetHistoryService(ServiceAccessType access) {
     return history_service_.get();
@@ -246,6 +249,9 @@ class TestingProfile : public Profile {
   scoped_ptr<PrefService> prefs_;
 
  private:
+  // Destroys favicon service if it has been created.
+  void DestroyFaviconService();
+
   // If the history service has been created, it is destroyed. This is invoked
   // from the destructor.
   void DestroyHistoryService();
@@ -254,6 +260,9 @@ class TestingProfile : public Profile {
   // from the destructor.
   void DestroyWebDataService();
 
+  // The favicon service. Only created if CreateFaviconService is invoked.
+  scoped_refptr<FaviconService> favicon_service_;
+
   // The history service. Only created if CreateHistoryService is invoked.
   scoped_refptr<HistoryService> history_service_;