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

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

Issue 2354613002: [Sync] Fix namespaces for the browser_sync component. (Closed)
Patch Set: Address comments. 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 f0224e3829fc9c45eb602c6184b01a76164c6203..6f1ba05ff66d191f30890237932687ed2cf80825 100644
--- a/chrome/browser/sync/profile_sync_service_android.cc
+++ b/chrome/browser/sync/profile_sync_service_android.cc
@@ -48,6 +48,7 @@ using base::android::ConvertJavaStringToUTF8;
using base::android::ConvertUTF8ToJavaString;
using base::android::JavaParamRef;
using base::android::ScopedJavaLocalRef;
+using browser_sync::ProfileSyncService;
using content::BrowserThread;
namespace {
@@ -83,17 +84,17 @@ ScopedJavaLocalRef<jintArray> ModelTypeSetToJavaIntArray(
} // namespace
ProfileSyncServiceAndroid::ProfileSyncServiceAndroid(JNIEnv* env, jobject obj)
- : profile_(NULL),
- sync_service_(NULL),
+ : profile_(nullptr),
+ sync_service_(nullptr),
weak_java_profile_sync_service_(env, obj) {
- if (g_browser_process == NULL ||
- g_browser_process->profile_manager() == NULL) {
+ if (g_browser_process == nullptr ||
+ g_browser_process->profile_manager() == nullptr) {
NOTREACHED() << "Browser process or profile manager not initialized";
return;
}
profile_ = ProfileManager::GetActiveUserProfile();
- if (profile_ == NULL) {
+ if (profile_ == nullptr) {
NOTREACHED() << "Sync Init: Profile not found.";
return;
}
« no previous file with comments | « chrome/browser/sync/profile_sync_service_android.h ('k') | chrome/browser/sync/profile_sync_service_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698