OLD | NEW |
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/message_loop/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
(...skipping 907 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
918 if (!pref_proxy_config_tracker_.get()) { | 918 if (!pref_proxy_config_tracker_.get()) { |
919 // TestingProfile is used in unit tests, where local state is not available. | 919 // TestingProfile is used in unit tests, where local state is not available. |
920 pref_proxy_config_tracker_.reset( | 920 pref_proxy_config_tracker_.reset( |
921 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(GetPrefs(), | 921 ProxyServiceFactory::CreatePrefProxyConfigTrackerOfProfile(GetPrefs(), |
922 NULL)); | 922 NULL)); |
923 } | 923 } |
924 return pref_proxy_config_tracker_.get(); | 924 return pref_proxy_config_tracker_.get(); |
925 } | 925 } |
926 | 926 |
927 void TestingProfile::BlockUntilHistoryProcessesPendingRequests() { | 927 void TestingProfile::BlockUntilHistoryProcessesPendingRequests() { |
928 HistoryService* history_service = | 928 HistoryService* history_service = HistoryServiceFactory::GetForProfile( |
929 HistoryServiceFactory::GetForProfile(this, Profile::EXPLICIT_ACCESS); | 929 this, ServiceAccessType::EXPLICIT_ACCESS); |
930 DCHECK(history_service); | 930 DCHECK(history_service); |
931 DCHECK(base::MessageLoop::current()); | 931 DCHECK(base::MessageLoop::current()); |
932 | 932 |
933 base::CancelableTaskTracker tracker; | 933 base::CancelableTaskTracker tracker; |
934 history_service->ScheduleDBTask( | 934 history_service->ScheduleDBTask( |
935 scoped_ptr<history::HistoryDBTask>( | 935 scoped_ptr<history::HistoryDBTask>( |
936 new QuittingHistoryDBTask()), | 936 new QuittingHistoryDBTask()), |
937 &tracker); | 937 &tracker); |
938 base::MessageLoop::current()->Run(); | 938 base::MessageLoop::current()->Run(); |
939 } | 939 } |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1064 #if defined(ENABLE_EXTENSIONS) | 1064 #if defined(ENABLE_EXTENSIONS) |
1065 extension_policy_, | 1065 extension_policy_, |
1066 #endif | 1066 #endif |
1067 pref_service_.Pass(), | 1067 pref_service_.Pass(), |
1068 original_profile, | 1068 original_profile, |
1069 guest_session_, | 1069 guest_session_, |
1070 supervised_user_id_, | 1070 supervised_user_id_, |
1071 policy_service_.Pass(), | 1071 policy_service_.Pass(), |
1072 testing_factories_); | 1072 testing_factories_); |
1073 } | 1073 } |
OLD | NEW |