ProfileSyncService: Handle null SupervisedUserService

chrome/browser/supervised_user/supervised_user_service_factory.cc

Index: chrome/browser/supervised_user/supervised_user_service_factory.cc
diff --git a/chrome/browser/supervised_user/supervised_user_service_factory.cc b/chrome/browser/supervised_user/supervised_user_service_factory.cc
index 16646528a7bca4cf4b08bf75b90eced337625156..41796a78111d34d2fff60c58ff7da576c01ca96c 100644
--- a/chrome/browser/supervised_user/supervised_user_service_factory.cc
+++ b/chrome/browser/supervised_user/supervised_user_service_factory.cc
@@ -25,6 +25,13 @@ SupervisedUserService* SupervisedUserServiceFactory::GetForProfile(
 }
 
 // static
+SupervisedUserService* SupervisedUserServiceFactory::GetForProfileIfExists(
+    Profile* profile) {
+  return static_cast<SupervisedUserService*>(
+      GetInstance()->GetServiceForBrowserContext(profile, false /* create */));

[Marc Treib, 2017/05/08 08:14:13]

nit: Prefer
/*create=*/true
because some tools such as clang-tidy understand that style (and verify that the
comment actually matches the declared parameter name).

[rishiag, 2017/05/08 17:55:14]

Done.

+}
+
+// static
 SupervisedUserServiceFactory* SupervisedUserServiceFactory::GetInstance() {
   return base::Singleton<SupervisedUserServiceFactory>::get();
 }
@@ -43,8 +50,6 @@ SupervisedUserServiceFactory::SupervisedUserServiceFactory()
       extensions::ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
 #endif
   DependsOn(ProfileOAuth2TokenServiceFactory::GetInstance());
-
-  // TODO(skym, crbug.com/705545): Fix this circular dependency.
   DependsOn(ProfileSyncServiceFactory::GetInstance());
 }