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

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

Issue 1393233002: Mac Energy Test Harness/Framework Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Snapshot of scripts for http://crbug.com/391646 Created 5 years, 2 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
« no previous file with comments | « chrome/test/base/browser_with_content_test.cc ('k') | makeplots.sh » ('j') | 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 "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 441 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 // simulating ProfileImpl::GetOffTheRecordPrefs(). 452 // simulating ProfileImpl::GetOffTheRecordPrefs().
453 if (!IsOffTheRecord()) { 453 if (!IsOffTheRecord()) {
454 DCHECK(!original_profile_); 454 DCHECK(!original_profile_);
455 user_prefs::PrefRegistrySyncable* pref_registry = 455 user_prefs::PrefRegistrySyncable* pref_registry =
456 static_cast<user_prefs::PrefRegistrySyncable*>( 456 static_cast<user_prefs::PrefRegistrySyncable*>(
457 prefs_->DeprecatedGetPrefRegistry()); 457 prefs_->DeprecatedGetPrefRegistry());
458 browser_context_dependency_manager_-> 458 browser_context_dependency_manager_->
459 RegisterProfilePrefsForServices(this, pref_registry); 459 RegisterProfilePrefsForServices(this, pref_registry);
460 } 460 }
461 461
462 browser_context_dependency_manager_->CreateBrowserContextServicesForTest( 462 // browser_context_dependency_manager_->CreateBrowserContextServicesForTest(
463 this); 463 // this);
464 464
465 #if defined(ENABLE_SUPERVISED_USERS) 465 #if defined(ENABLE_SUPERVISED_USERS)
466 if (!IsOffTheRecord()) { 466 if (!IsOffTheRecord()) {
467 SupervisedUserSettingsService* settings_service = 467 SupervisedUserSettingsService* settings_service =
468 SupervisedUserSettingsServiceFactory::GetForProfile(this); 468 SupervisedUserSettingsServiceFactory::GetForProfile(this);
469 TestingPrefStore* store = new TestingPrefStore(); 469 TestingPrefStore* store = new TestingPrefStore();
470 settings_service->Init(store); 470 settings_service->Init(store);
471 store->SetInitializationCompleted(); 471 store->SetInitializationCompleted();
472 } 472 }
473 #endif 473 #endif
(...skipping 574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 #if defined(ENABLE_EXTENSIONS) 1048 #if defined(ENABLE_EXTENSIONS)
1049 extension_policy_, 1049 extension_policy_,
1050 #endif 1050 #endif
1051 pref_service_.Pass(), 1051 pref_service_.Pass(),
1052 original_profile, 1052 original_profile,
1053 guest_session_, 1053 guest_session_,
1054 supervised_user_id_, 1054 supervised_user_id_,
1055 policy_service_.Pass(), 1055 policy_service_.Pass(),
1056 testing_factories_); 1056 testing_factories_);
1057 } 1057 }
OLDNEW
« no previous file with comments | « chrome/test/base/browser_with_content_test.cc ('k') | makeplots.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698