commit 0a37945f852bb8f479886642df5815e22879beea
author maxbogue <maxbogue@chromium.org> Thu Sep 22 21:35:05 2016
committer Commit bot <commit-bot@chromium.org> Thu Sep 22 21:36:36 2016
tree 3be9a3581daef810f6243f448c91e840cd6db8b2
parent b6869005595fb70b69ad29df2c8f3fd563c2feff

[Sync] Fix namespaces for the browser_sync component.

Things within a component should have a namespace that matches its name.

BUG=646685
TBR=brettw

Review-Url: https://codereview.chromium.org/2354613002
Cr-Commit-Position: refs/heads/master@{#420465}

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 f0224e3..6f1ba05f 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::ConvertUTF8ToJavaString;
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
+using browser_sync::ProfileSyncService;
 using content::BrowserThread;
 
 namespace {
@@ -83,17 +84,17 @@
 }  // 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;
   }