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

Unified Diff: chrome/browser/sync/profile_sync_service_android.cc

Issue 2376123003: [Sync] Move //components/sync to the syncer namespace. (Closed)
Patch Set: Fix tools and iOS. Created 4 years, 3 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: chrome/browser/sync/profile_sync_service_android.cc
diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc
index 6f1ba05ff66d191f30890237932687ed2cf80825..8a3eaea18887ebaf7aac835a065463b25f75ca23 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -7,7 +7,8 @@
#include <stddef.h>
#include <stdint.h>
-#include <memory>
+#include <string>
+#include <vector>
#include "base/android/jni_android.h"
#include "base/android/jni_array.h"
@@ -99,7 +100,7 @@ ProfileSyncServiceAndroid::ProfileSyncServiceAndroid(JNIEnv* env, jobject obj)
return;
}
- sync_prefs_.reset(new sync_driver::SyncPrefs(profile_->GetPrefs()));
+ sync_prefs_.reset(new syncer::SyncPrefs(profile_->GetPrefs()));
sync_service_ =
ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
@@ -470,7 +471,7 @@ ScopedJavaLocalRef<jstring> ProfileSyncServiceAndroid::GetAboutInfoForTest(
DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<base::DictionaryValue> about_info =
- sync_driver::sync_ui_util::ConstructAboutInformation(
+ syncer::sync_ui_util::ConstructAboutInformation(
sync_service_, sync_service_->signin(), chrome::GetChannel());
std::string about_info_json;
base::JSONWriter::Write(*about_info, &about_info_json);
@@ -485,7 +486,7 @@ jlong ProfileSyncServiceAndroid::GetLastSyncedTimeForTest(
// conversion, since SyncPrefs::GetLastSyncedTime() converts the stored value
// to to base::Time.
return static_cast<jlong>(
- profile_->GetPrefs()->GetInt64(sync_driver::prefs::kSyncLastSyncedTime));
+ profile_->GetPrefs()->GetInt64(syncer::prefs::kSyncLastSyncedTime));
}
void ProfileSyncServiceAndroid::OverrideNetworkResourcesForTest(

Powered by Google App Engine
This is Rietveld 408576698