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 "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 834 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
845 } | 845 } |
846 return pref_proxy_config_tracker_.get(); | 846 return pref_proxy_config_tracker_.get(); |
847 } | 847 } |
848 | 848 |
849 void TestingProfile::BlockUntilHistoryProcessesPendingRequests() { | 849 void TestingProfile::BlockUntilHistoryProcessesPendingRequests() { |
850 HistoryService* history_service = | 850 HistoryService* history_service = |
851 HistoryServiceFactory::GetForProfile(this, Profile::EXPLICIT_ACCESS); | 851 HistoryServiceFactory::GetForProfile(this, Profile::EXPLICIT_ACCESS); |
852 DCHECK(history_service); | 852 DCHECK(history_service); |
853 DCHECK(base::MessageLoop::current()); | 853 DCHECK(base::MessageLoop::current()); |
854 | 854 |
855 CancelableRequestConsumer consumer; | 855 base::CancelableTaskTracker tracker; |
856 history_service->ScheduleDBTask(new QuittingHistoryDBTask(), &consumer); | 856 history_service->ScheduleDBTask(new QuittingHistoryDBTask(), &tracker); |
857 base::MessageLoop::current()->Run(); | 857 base::MessageLoop::current()->Run(); |
858 } | 858 } |
859 | 859 |
860 chrome_browser_net::Predictor* TestingProfile::GetNetworkPredictor() { | 860 chrome_browser_net::Predictor* TestingProfile::GetNetworkPredictor() { |
861 return NULL; | 861 return NULL; |
862 } | 862 } |
863 | 863 |
864 DevToolsNetworkController* TestingProfile::GetDevToolsNetworkController() { | 864 DevToolsNetworkController* TestingProfile::GetDevToolsNetworkController() { |
865 return NULL; | 865 return NULL; |
866 } | 866 } |
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
957 path_, | 957 path_, |
958 delegate_, | 958 delegate_, |
959 extension_policy_, | 959 extension_policy_, |
960 pref_service_.Pass(), | 960 pref_service_.Pass(), |
961 incognito_, | 961 incognito_, |
962 guest_session_, | 962 guest_session_, |
963 supervised_user_id_, | 963 supervised_user_id_, |
964 policy_service_.Pass(), | 964 policy_service_.Pass(), |
965 testing_factories_)); | 965 testing_factories_)); |
966 } | 966 } |
OLD | NEW |