[Sync] Move SyncPrefs into sync_driver component
This also moves all sync preferences out of the common pref_names file and into
a sync_driver specific pref_names. To allow that, the dependency on history
policy is moved into the typed_url_data_type_controller, and a dependency
on the deprecated acknowledged types pref is removed from ntp_resource_cache.
BUG=339726
[email protected], [email protected], [email protected]
[email protected], [email protected]
Review URL: https://codereview.chromium.org/195873020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258415 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 9717168..8ee0e7a 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -22,9 +22,9 @@
#include "chrome/browser/sync/about_sync_util.h"
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/browser/sync/profile_sync_service_factory.h"
-#include "chrome/browser/sync/sync_prefs.h"
#include "chrome/browser/sync/sync_ui_util.h"
-#include "chrome/common/pref_names.h"
+#include "components/sync_driver/pref_names.h"
+#include "components/sync_driver/sync_prefs.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
@@ -70,7 +70,7 @@
return;
}
- sync_prefs_.reset(new browser_sync::SyncPrefs(profile_->GetPrefs()));
+ sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
sync_service_ =
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
@@ -472,7 +472,7 @@
// conversion, since SyncPrefs::GetLastSyncedTime() converts the stored value
// to to base::Time.
return static_cast<jlong>(
- profile_->GetPrefs()->GetInt64(prefs::kSyncLastSyncedTime));
+ profile_->GetPrefs()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
}
void ProfileSyncServiceAndroid::NudgeSyncer(JNIEnv* env,
