Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(436)

Unified Diff: components/browser_sync/profile_sync_service.h

Issue 2732333003: [Sync] ModelTypeStore factory shouldn't require valid PSS to function correctly (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/browser_sync/profile_sync_service.h
diff --git a/components/browser_sync/profile_sync_service.h b/components/browser_sync/profile_sync_service.h
index 7048a483f899c0dd998749f02a638d8fbc3049eb..3c4863bdf55dd53946f6a2922f2cf1ef6292e1a6 100644
--- a/components/browser_sync/profile_sync_service.h
+++ b/components/browser_sync/profile_sync_service.h
@@ -20,6 +20,7 @@
#include "base/message_loop/message_loop.h"
#include "base/observer_list.h"
#include "base/strings/string16.h"
+#include "base/threading/sequenced_worker_pool.h"
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -56,7 +57,6 @@
#include "net/base/backoff_entry.h"
#include "url/gurl.h"
-class Profile;
class ProfileOAuth2TokenService;
class SigninManagerWrapper;
@@ -240,7 +240,6 @@ class ProfileSyncService : public syncer::SyncServiceBase,
scoped_refptr<net::URLRequestContextGetter> url_request_context;
std::string debug_identifier;
version_info::Channel channel = version_info::Channel::UNKNOWN;
- scoped_refptr<base::SequencedTaskRunner> blocking_task_runner;
private:
DISALLOW_COPY_AND_ASSIGN(InitParams);
@@ -552,9 +551,11 @@ class ProfileSyncService : public syncer::SyncServiceBase,
const PlatformSyncAllowedProvider& platform_sync_allowed_provider);
// Returns a function for |type| that will create a ModelTypeStore that shares
- // the sync LevelDB backend.
- syncer::ModelTypeStoreFactory GetModelTypeStoreFactory(
- syncer::ModelType type);
+ // the sync LevelDB backend. |base_path| should be set to profile path.
skym 2017/03/08 19:28:15 And what should |sequenced_worker_pool| be?
pavely 2017/03/08 20:41:12 Done.
+ static syncer::ModelTypeStoreFactory GetModelTypeStoreFactory(
+ syncer::ModelType type,
+ const base::FilePath& base_path,
+ base::SequencedWorkerPool* sequenced_worker_pool);
// Needed to test whether the directory is deleted properly.
base::FilePath GetDirectoryPathForTest() const;
@@ -759,9 +760,6 @@ class ProfileSyncService : public syncer::SyncServiceBase,
// The request context in which sync should operate.
scoped_refptr<net::URLRequestContextGetter> url_request_context_;
- // The task runner to use for blocking IO operations.
- scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-
// Indicates if this is the first time sync is being configured. This value
// is equal to !IsFirstSetupComplete() at the time of OnEngineInitialized().
bool is_first_time_sync_configure_;

Powered by Google App Engine
This is Rietveld 408576698