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