Introduce BookmarkClient interface to abstract embedder

chrome/browser/bookmarks/bookmark_storage.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_storage.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/metrics/histogram.h"
+#include "base/sequenced_task_runner.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_codec.h"
 #include "chrome/browser/bookmarks/bookmark_index.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
+#include "components/bookmarks/core/browser/bookmark_client.h"
 #include "components/bookmarks/core/common/bookmark_constants.h"
 #include "components/startup_metric_utils/startup_metric_utils.h"
-#include "content/public/browser/browser_context.h"
-#include "content/public/browser/browser_thread.h"
 
 using base::TimeTicks;
-using content::BrowserThread;
 
 namespace {
 
 // Extension used for backup files (copy of main file created during startup).
 const base::FilePath::CharType kBackupExtension[] = FILE_PATH_LITERAL("bak");
 
 // How often we save.
 const int kSaveDelayMS = 2500;
 
 void BackupCallback(const base::FilePath& path) {
   base::FilePath backup_path = path.ReplaceExtension(kBackupExtension);
   base::CopyFile(path, backup_path);
 }
 
 // Adds node to the model's index, recursing through all children as well.
 void AddBookmarksToIndex(BookmarkLoadDetails* details,
                          BookmarkNode* node) {
   if (node->is_url()) {
     if (node->url().is_valid())
       details->index()->Add(node);
   } else {
     for (int i = 0; i < node->child_count(); ++i)
       AddBookmarksToIndex(details, node->GetChild(i));
   }
 }
 
-void LoadCallback(const base::FilePath& path,
+void LoadCallback(BookmarkClient* client,
+                  const base::FilePath& path,
                   BookmarkStorage* storage,
                   BookmarkLoadDetails* details) {
   startup_metric_utils::ScopedSlowStartupUMA
       scoped_timer("Startup.SlowStartupBookmarksLoad");
   bool bookmark_file_exists = base::PathExists(path);
   if (bookmark_file_exists) {
     JSONFileValueSerializer serializer(path);
     scoped_ptr<base::Value> root(serializer.Deserialize(NULL, NULL));
 
     if (root.get()) {
@@ skipping 16 matching lines @@
 
       start_time = TimeTicks::Now();
       AddBookmarksToIndex(details, details->bb_node());
       AddBookmarksToIndex(details, details->other_folder_node());
       AddBookmarksToIndex(details, details->mobile_folder_node());
       UMA_HISTOGRAM_TIMES("Bookmarks.CreateBookmarkIndexTime",
                           TimeTicks::Now() - start_time);
     }
   }
 
-  BrowserThread::PostTask(
-      BrowserThread::UI, FROM_HERE,
-      base::Bind(&BookmarkStorage::OnLoadFinished, storage));
+  client->PostTask(FROM_HERE,
+                   base::Bind(&BookmarkStorage::OnLoadFinished, storage));
 }
 
 }  // namespace
 
 // BookmarkLoadDetails ---------------------------------------------------------
 
 BookmarkLoadDetails::BookmarkLoadDetails(
     BookmarkPermanentNode* bb_node,
     BookmarkPermanentNode* other_folder_node,
     BookmarkPermanentNode* mobile_folder_node,
     BookmarkIndex* index,
     int64 max_id)
     : bb_node_(bb_node),
       other_folder_node_(other_folder_node),
       mobile_folder_node_(mobile_folder_node),
       index_(index),
       model_sync_transaction_version_(
           BookmarkNode::kInvalidSyncTransactionVersion),
       max_id_(max_id),
       ids_reassigned_(false) {
 }
 
 BookmarkLoadDetails::~BookmarkLoadDetails() {
 }
 
 // BookmarkStorage -------------------------------------------------------------
 
 BookmarkStorage::BookmarkStorage(
-    content::BrowserContext* context,
     BookmarkModel* model,
+    const base::FilePath& profile_path,
     base::SequencedTaskRunner* sequenced_task_runner)
     : model_(model),
-      writer_(context->GetPath().Append(bookmarks::kBookmarksFileName),
+      writer_(profile_path.Append(bookmarks::kBookmarksFileName),
               sequenced_task_runner) {
   sequenced_task_runner_ = sequenced_task_runner;
   writer_.set_commit_interval(base::TimeDelta::FromMilliseconds(kSaveDelayMS));
   sequenced_task_runner_->PostTask(FROM_HERE,
                                    base::Bind(&BackupCallback, writer_.path()));
 }
 
 BookmarkStorage::~BookmarkStorage() {
   if (writer_.HasPendingWrite())
     writer_.DoScheduledWrite();
 }
 
-void BookmarkStorage::LoadBookmarks(BookmarkLoadDetails* details) {
+void BookmarkStorage::LoadBookmarks(BookmarkClient* client,
+                                    BookmarkLoadDetails* details) {
   DCHECK(!details_.get());
   DCHECK(details);
   details_.reset(details);
-  sequenced_task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&LoadCallback, writer_.path(), make_scoped_refptr(this),
-                 details_.get()));
+  sequenced_task_runner_->PostTask(FROM_HERE,
+                                   base::Bind(&LoadCallback,
+                                              client,
+                                              writer_.path(),
+                                              make_scoped_refptr(this),
+                                              details_.get()));
 }
 
 void BookmarkStorage::ScheduleSave() {
   writer_.ScheduleWrite(this);
 }
 
 void BookmarkStorage::BookmarkModelDeleted() {
   // We need to save now as otherwise by the time SaveNow is invoked
   // the model is gone.
   if (writer_.HasPendingWrite())
@@ skipping 23 matching lines @@
     NOTREACHED();
     return false;
   }
 
   std::string data;
   if (!SerializeData(&data))
     return false;
   writer_.WriteNow(data);
   return true;
 }