Supervised Users Initiated Installs v2

chrome/test/base/testing_profile.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/base/testing_profile.h"
 
 #include <utility>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 57 matching lines @@
 #include "components/keyed_service/core/refcounted_keyed_service.h"
 #include "components/omnibox/browser/autocomplete_classifier.h"
 #include "components/omnibox/browser/history_index_restore_observer.h"
 #include "components/omnibox/browser/in_memory_url_index.h"
 #include "components/policy/core/common/configuration_policy_provider.h"
 #include "components/policy/core/common/policy_service.h"
 #include "components/policy/core/common/policy_service_impl.h"
 #include "components/policy/core/common/schema.h"
 #include "components/prefs/testing_pref_store.h"
 #include "components/proxy_config/pref_proxy_config_tracker.h"
+#include "components/syncable_prefs/pref_service_mock_factory.h"
 #include "components/syncable_prefs/pref_service_syncable.h"
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "components/ui/zoom/zoom_event_manager.h"
 #include "components/user_prefs/user_prefs.h"
 #include "components/webdata_services/web_data_service_wrapper.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cookie_store_factory.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/storage_partition.h"
@@ skipping 21 matching lines @@
 #include "extensions/browser/extension_prefs_observer.h"
 #include "extensions/browser/extension_system.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "chrome/browser/signin/oauth2_token_service_delegate_android.h"
 #endif
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
+#include "chrome/browser/supervised_user/supervised_user_pref_store.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_settings_service_factory.h"
 #endif
 
 using base::Time;
 using bookmarks::BookmarkModel;
 using content::BrowserThread;
 using content::DownloadManagerDelegate;
 using testing::NiceMock;
 using testing::Return;
@@ skipping 194 matching lines @@
     const std::string& supervised_user_id,
     std::unique_ptr<policy::PolicyService> policy_service,
     const TestingFactories& factories,
     const std::string& profile_name)
     : start_time_(Time::Now()),
       prefs_(prefs.release()),
       testing_prefs_(NULL),
       force_incognito_(false),
       original_profile_(parent),
       guest_session_(guest_session),
+      supervised_user_id_(supervised_user_id),
       last_session_exited_cleanly_(true),
 #if defined(ENABLE_EXTENSIONS)
       extension_special_storage_policy_(extension_policy),
 #endif
       profile_path_(path),
       browser_context_dependency_manager_(
           BrowserContextDependencyManager::GetInstance()),
       resource_context_(NULL),
       delegate_(delegate),
       profile_name_(profile_name),
@@ skipping 69 matching lines @@
 #if defined(OS_ANDROID)
   // Make sure token service knows its running in tests.
   OAuth2TokenServiceDelegateAndroid::set_is_testing_profile();
 #endif
 
   // Normally this would happen during browser startup, but for tests
   // we need to trigger creation of Profile-related services.
   ChromeBrowserMainExtraPartsProfiles::
       EnsureBrowserContextKeyedServiceFactoriesBuilt();
 
+#if defined(ENABLE_SUPERVISED_USERS)

[Marc Treib, 2016/05/24 09:54:58]

Is it necessary to move this up here?
It used to happen after
browser_context_dependency_manager_->CreateBrowserContextServicesForTest, doing
it before that seems like it might mess things up...

[mamir, 2016/06/03 09:45:55]

Yes, it is.
Because CreatePrefServiceForSupervisedUser() requires the
SupervisedUserSettingsService to be initialized (specifically to have a pref
store)

[Marc Treib, 2016/06/03 13:24:13]

And moving all the PrefService stuff down, after the dependency manager is
initialized, is not an option?

[mamir, 2016/06/06 15:01:36]

I checked but couldn't be 100% sure whether it causes problems as currently
implemented.
This is anyway a TestingProfile and all tests pass, so, we should be relatively
fine.!

[Marc Treib, 2016/06/07 10:27:03]

Acknowledged.

+  if (!IsOffTheRecord()) {
+    SupervisedUserSettingsService* settings_service =
+        SupervisedUserSettingsServiceFactory::GetForProfile(this);
+    TestingPrefStore* store = new TestingPrefStore();
+    settings_service->Init(store);
+    store->SetInitializationCompleted();
+  }
+#endif
+
   if (prefs_.get())
     user_prefs::UserPrefs::Set(this, prefs_.get());
   else if (IsOffTheRecord())
     CreateIncognitoPrefService();
+  else if (!supervised_user_id_.empty())
+    CreatePrefServiceForSupervisedUser();
   else
     CreateTestingPrefService();
 
   if (!base::PathExists(profile_path_))
     base::CreateDirectory(profile_path_);
 
   // TODO(joaodasilva): remove this once this PKS isn't created in ProfileImpl
   // anymore, after converting the PrefService to a PKS. Until then it must
   // be associated with a TestingProfile too.
   if (!IsOffTheRecord())
@@ skipping 30 matching lines @@
     DCHECK(!original_profile_);
     user_prefs::PrefRegistrySyncable* pref_registry =
         static_cast<user_prefs::PrefRegistrySyncable*>(
             prefs_->DeprecatedGetPrefRegistry());
     browser_context_dependency_manager_->
         RegisterProfilePrefsForServices(this, pref_registry);
   }
 
   browser_context_dependency_manager_->CreateBrowserContextServicesForTest(
       this);
-
-#if defined(ENABLE_SUPERVISED_USERS)
-  if (!IsOffTheRecord()) {
-    SupervisedUserSettingsService* settings_service =
-        SupervisedUserSettingsServiceFactory::GetForProfile(this);
-    TestingPrefStore* store = new TestingPrefStore();
-    settings_service->Init(store);
-    store->SetInitializationCompleted();
-  }
-#endif
 }
 
 void TestingProfile::FinishInit() {
   DCHECK(content::NotificationService::current());
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CREATED,
       content::Source<Profile>(static_cast<Profile*>(this)),
       content::NotificationService::NoDetails());
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
@@ skipping 245 matching lines @@
 }
 
 void TestingProfile::CreateTestingPrefService() {
   DCHECK(!prefs_.get());
   testing_prefs_ = new syncable_prefs::TestingPrefServiceSyncable();
   prefs_.reset(testing_prefs_);
   user_prefs::UserPrefs::Set(this, prefs_.get());
   chrome::RegisterUserProfilePrefs(testing_prefs_->registry());
 }
 
+void TestingProfile::CreatePrefServiceForSupervisedUser() {
+  DCHECK(!prefs_.get());
+  DCHECK(!supervised_user_id_.empty());
+  syncable_prefs::PrefServiceMockFactory factory;
+  SupervisedUserSettingsService* supervised_user_settings =
+      SupervisedUserSettingsServiceFactory::GetForProfile(this);
+  scoped_refptr<PrefStore> supervised_user_prefs =
+      make_scoped_refptr(new SupervisedUserPrefStore(supervised_user_settings));
+
+  factory.set_supervised_user_prefs(supervised_user_prefs);
+
+  scoped_refptr<user_prefs::PrefRegistrySyncable> registry(
+      new user_prefs::PrefRegistrySyncable);
+
+  prefs_= factory.CreateSyncable(registry.get());
+  chrome::RegisterUserProfilePrefs(registry.get());
+  user_prefs::UserPrefs::Set(this, prefs_.get());
+}
+
 void TestingProfile::CreateIncognitoPrefService() {
   DCHECK(original_profile_);
   DCHECK(!testing_prefs_);
   // Simplified version of ProfileImpl::GetOffTheRecordPrefs(). Note this
   // leaves testing_prefs_ unset.
   prefs_.reset(CreateIncognitoPrefServiceSyncable(
       original_profile_->prefs_.get(), NULL));
   user_prefs::UserPrefs::Set(this, prefs_.get());
 }
 
@@ skipping 271 matching lines @@
   // Note: Owned by |original_profile|.
   return new TestingProfile(path_, delegate_,
 #if defined(ENABLE_EXTENSIONS)
                             extension_policy_,
 #endif
                             std::move(pref_service_), original_profile,
                             guest_session_, supervised_user_id_,
                             std::move(policy_service_), testing_factories_,
                             profile_name_);
 }