| Index: chrome/browser/prefs/chrome_pref_model_associator_client.h
|
| diff --git a/chrome/browser/prefs/chrome_pref_model_associator_client.h b/chrome/browser/prefs/chrome_pref_model_associator_client.h
|
| index 4a79aabf40c8a9d4bee161f7ea3ad17eab398d72..243315fa6587ecd2d27d05bdfc458d5c1593dcc0 100644
|
| --- a/chrome/browser/prefs/chrome_pref_model_associator_client.h
|
| +++ b/chrome/browser/prefs/chrome_pref_model_associator_client.h
|
| @@ -8,7 +8,7 @@
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "components/syncable_prefs/pref_model_associator_client.h"
|
| +#include "components/sync_preferences/pref_model_associator_client.h"
|
|
|
| namespace base {
|
| template <typename T>
|
| @@ -16,7 +16,7 @@ struct DefaultSingletonTraits;
|
| }
|
|
|
| class ChromePrefModelAssociatorClient
|
| - : public syncable_prefs::PrefModelAssociatorClient {
|
| + : public sync_preferences::PrefModelAssociatorClient {
|
| public:
|
| // Returns the global instance.
|
| static ChromePrefModelAssociatorClient* GetInstance();
|
| @@ -27,7 +27,7 @@ class ChromePrefModelAssociatorClient
|
| ChromePrefModelAssociatorClient();
|
| ~ChromePrefModelAssociatorClient() override;
|
|
|
| - // syncable_prefs::PrefModelAssociatorClient implementation.
|
| + // sync_preferences::PrefModelAssociatorClient implementation.
|
| bool IsMergeableListPreference(const std::string& pref_name) const override;
|
| bool IsMergeableDictionaryPreference(
|
| const std::string& pref_name) const override;
|
|
|