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

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

Issue 416543006: Revert 284958 "Make HistoryDBTask not refcounted, and ensure it'..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 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 | « trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('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 "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
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( 854 history_service->ScheduleDBTask(new QuittingHistoryDBTask(), &tracker);
855 scoped_ptr<history::HistoryDBTask>(
856 new QuittingHistoryDBTask()),
857 &tracker);
858 base::MessageLoop::current()->Run(); 855 base::MessageLoop::current()->Run();
859 } 856 }
860 857
861 chrome_browser_net::Predictor* TestingProfile::GetNetworkPredictor() { 858 chrome_browser_net::Predictor* TestingProfile::GetNetworkPredictor() {
862 return NULL; 859 return NULL;
863 } 860 }
864 861
865 DevToolsNetworkController* TestingProfile::GetDevToolsNetworkController() { 862 DevToolsNetworkController* TestingProfile::GetDevToolsNetworkController() {
866 return NULL; 863 return NULL;
867 } 864 }
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 path_, 955 path_,
959 delegate_, 956 delegate_,
960 extension_policy_, 957 extension_policy_,
961 pref_service_.Pass(), 958 pref_service_.Pass(),
962 incognito_, 959 incognito_,
963 guest_session_, 960 guest_session_,
964 supervised_user_id_, 961 supervised_user_id_,
965 policy_service_.Pass(), 962 policy_service_.Pass(),
966 testing_factories_)); 963 testing_factories_));
967 } 964 }
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/webui/signin/inline_login_handler_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698