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

Side by Side Diff: chrome/test/base/testing_profile.cc

Issue 335833003: Rename "managed (mode|user)" to "supervised user" (part 2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review comments (+ a few other cleanups) Created 6 years, 6 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/test/base/testing_profile.h" 5 #include "chrome/test/base/testing_profile.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 89
90 #if defined(ENABLE_EXTENSIONS) 90 #if defined(ENABLE_EXTENSIONS)
91 #include "chrome/browser/guest_view/guest_view_manager.h" 91 #include "chrome/browser/guest_view/guest_view_manager.h"
92 #endif 92 #endif
93 93
94 #if defined(OS_ANDROID) 94 #if defined(OS_ANDROID)
95 #include "chrome/browser/signin/android_profile_oauth2_token_service.h" 95 #include "chrome/browser/signin/android_profile_oauth2_token_service.h"
96 #endif 96 #endif
97 97
98 #if defined(ENABLE_MANAGED_USERS) 98 #if defined(ENABLE_MANAGED_USERS)
99 #include "chrome/browser/managed_mode/managed_user_settings_service.h" 99 #include "chrome/browser/supervised_user/supervised_user_settings_service.h"
100 #include "chrome/browser/managed_mode/managed_user_settings_service_factory.h" 100 #include "chrome/browser/supervised_user/supervised_user_settings_service_factor y.h"
101 #endif 101 #endif
102 102
103 using base::Time; 103 using base::Time;
104 using content::BrowserThread; 104 using content::BrowserThread;
105 using content::DownloadManagerDelegate; 105 using content::DownloadManagerDelegate;
106 using testing::NiceMock; 106 using testing::NiceMock;
107 using testing::Return; 107 using testing::Return;
108 108
109 namespace { 109 namespace {
110 110
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 browser_context_dependency_manager_->CreateBrowserContextServicesForTest( 368 browser_context_dependency_manager_->CreateBrowserContextServicesForTest(
369 this); 369 this);
370 370
371 #if defined(ENABLE_NOTIFICATIONS) 371 #if defined(ENABLE_NOTIFICATIONS)
372 // Install profile keyed service factory hooks for dummy/test services 372 // Install profile keyed service factory hooks for dummy/test services
373 DesktopNotificationServiceFactory::GetInstance()->SetTestingFactory( 373 DesktopNotificationServiceFactory::GetInstance()->SetTestingFactory(
374 this, CreateTestDesktopNotificationService); 374 this, CreateTestDesktopNotificationService);
375 #endif 375 #endif
376 376
377 #if defined(ENABLE_MANAGED_USERS) 377 #if defined(ENABLE_MANAGED_USERS)
378 ManagedUserSettingsService* settings_service = 378 SupervisedUserSettingsService* settings_service =
379 ManagedUserSettingsServiceFactory::GetForProfile(this); 379 SupervisedUserSettingsServiceFactory::GetForProfile(this);
380 TestingPrefStore* store = new TestingPrefStore(); 380 TestingPrefStore* store = new TestingPrefStore();
381 settings_service->Init(store); 381 settings_service->Init(store);
382 store->SetInitializationCompleted(); 382 store->SetInitializationCompleted();
383 #endif 383 #endif
384 384
385 profile_name_ = "testing_profile"; 385 profile_name_ = "testing_profile";
386 } 386 }
387 387
388 void TestingProfile::FinishInit() { 388 void TestingProfile::FinishInit() {
389 DCHECK(content::NotificationService::current()); 389 DCHECK(content::NotificationService::current());
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after
965 path_, 965 path_,
966 delegate_, 966 delegate_,
967 extension_policy_, 967 extension_policy_,
968 pref_service_.Pass(), 968 pref_service_.Pass(),
969 incognito_, 969 incognito_,
970 guest_session_, 970 guest_session_,
971 supervised_user_id_, 971 supervised_user_id_,
972 policy_service_.Pass(), 972 policy_service_.Pass(),
973 testing_factories_)); 973 testing_factories_));
974 } 974 }
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698