Chromium Code Reviews| Index: chrome/browser/extensions/api/storage/settings_sync_util.h |
| diff --git a/chrome/browser/extensions/api/storage/settings_sync_util.h b/chrome/browser/extensions/api/storage/settings_sync_util.h |
| index 4e23bae06192c33f64f1cefd4804652e3caab65e..12bb7ee7be4336d220a5e5e8b0ff7303865bb8d7 100644 |
| --- a/chrome/browser/extensions/api/storage/settings_sync_util.h |
| +++ b/chrome/browser/extensions/api/storage/settings_sync_util.h |
| @@ -5,6 +5,9 @@ |
| #ifndef CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_SYNC_UTIL_H_ |
| #define CHROME_BROWSER_EXTENSIONS_API_STORAGE_SETTINGS_SYNC_UTIL_H_ |
| +#include <string> |
| + |
| +#include "components/sync/driver/sync_client.h" |
| #include "components/sync/model/sync_change.h" |
| #include "components/sync/model/sync_data.h" |
| @@ -16,10 +19,6 @@ namespace content { |
| class BrowserContext; |
| } |
| -namespace syncer { |
| -class SyncableService; |
| -} |
| - |
| namespace extensions { |
| namespace settings_sync_util { |
| @@ -53,8 +52,9 @@ syncer::SyncChange CreateDelete( |
| // Returns the sync service for settings. Must be called on the FILE thread. |
| // |type| must be either APP_SETTINGS or EXTENSION_SETTINGS. |
| -syncer::SyncableService* GetSyncableService(content::BrowserContext* context, |
| - syncer::ModelType type); |
| +syncer::SyncClient::ServiceProvider GetSyncableServiceProvider( |
|
Devlin
2017/03/27 21:54:23
I'm a little nervous about this - when is the prov
skym
2017/03/27 22:38:47
FILE thread. Whooops, looks like I didn't put a DC
Devlin
2017/03/28 01:17:23
WeakPtrs are only safe if they are invalidated on
skym
2017/03/28 05:01:19
Hmm, I'm not sure. Reading https://cs.chromium.org
Devlin
2017/03/29 01:47:40
The section right above that makes it more clear,
|
| + content::BrowserContext* context, |
| + syncer::ModelType type); |
| } // namespace settings_sync_util |