bookmarks: Pass browser context pointer to BookmarkStorage instead of a pointer to Profile.

We are switching away from Profile, and content::BrowserContext is preferred
over it.

BUG=144783
R=sky@chromium.org

Review URL: https://codereview.chromium.org/11116015

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

chrome/browser/bookmarks/bookmark_storage.cc

@@ -8,15 +8,14 @@
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
-#include "base/file_util_proxy.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_constants.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 
 using base::TimeTicks;
@@ -107,9 +106,10 @@ BookmarkLoadDetails::~BookmarkLoadDetails() {
 
 // BookmarkStorage -------------------------------------------------------------
 
-BookmarkStorage::BookmarkStorage(Profile* profile, BookmarkModel* model)
+BookmarkStorage::BookmarkStorage(content::BrowserContext* context,
+                                 BookmarkModel* model)
     : model_(model),
-      writer_(profile->GetPath().Append(chrome::kBookmarksFileName),
+      writer_(context->GetPath().Append(chrome::kBookmarksFileName),
               BrowserThread::GetMessageLoopProxyForThread(
                   BrowserThread::FILE)) {
   writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS));

chrome/browser/bookmarks/bookmark_storage.h

@@ -12,7 +12,10 @@
 
 class BookmarkModel;
 class BookmarkPermanentNode;
-class Profile;
+
+namespace content {
+class BrowserContext;
+}
 
 // BookmarkLoadDetails is used by BookmarkStorage when loading bookmarks.
 // BookmarkModel creates a BookmarkLoadDetails and passes it (including
@@ -93,7 +96,7 @@ class BookmarkStorage : public ImportantFileWriter::DataSerializer,
                         public base::RefCountedThreadSafe<BookmarkStorage> {
  public:
   // Creates a BookmarkStorage for the specified model
-  BookmarkStorage(Profile* profile, BookmarkModel* model);
+  BookmarkStorage(content::BrowserContext* context, BookmarkModel* model);
 
   // Loads the bookmarks into the model, notifying the model when done. This
   // takes ownership of |details|. See BookmarkLoadDetails for details.