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

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

Issue 19714004: Revert 213148 "Add asserts to TestingProfile::CreateHistoryServi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 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
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 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_ 5 #ifndef CHROME_TEST_BASE_TESTING_PROFILE_H_
6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_ 6 #define CHROME_TEST_BASE_TESTING_PROFILE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
(...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 virtual ~TestingProfile(); 125 virtual ~TestingProfile();
126 126
127 // Creates the favicon service. Consequent calls would recreate the service. 127 // Creates the favicon service. Consequent calls would recreate the service.
128 void CreateFaviconService(); 128 void CreateFaviconService();
129 129
130 // Creates the history service. If |delete_file| is true, the history file is 130 // Creates the history service. If |delete_file| is true, the history file is
131 // deleted first, then the HistoryService is created. As TestingProfile 131 // deleted first, then the HistoryService is created. As TestingProfile
132 // deletes the directory containing the files used by HistoryService, this 132 // deletes the directory containing the files used by HistoryService, this
133 // only matters if you're recreating the HistoryService. If |no_db| is true, 133 // only matters if you're recreating the HistoryService. If |no_db| is true,
134 // the history backend will fail to initialize its database; this is useful 134 // the history backend will fail to initialize its database; this is useful
135 // for testing error conditions. Returns true on success. 135 // for testing error conditions.
136 bool CreateHistoryService(bool delete_file, bool no_db) WARN_UNUSED_RESULT; 136 void CreateHistoryService(bool delete_file, bool no_db);
137 137
138 // Shuts down and nulls out the reference to HistoryService. 138 // Shuts down and nulls out the reference to HistoryService.
139 void DestroyHistoryService(); 139 void DestroyHistoryService();
140 140
141 // Creates TopSites. This returns immediately, and top sites may not be 141 // Creates TopSites. This returns immediately, and top sites may not be
142 // loaded. Use BlockUntilTopSitesLoaded to ensure TopSites has finished 142 // loaded. Use BlockUntilTopSitesLoaded to ensure TopSites has finished
143 // loading. 143 // loading.
144 void CreateTopSites(); 144 void CreateTopSites();
145 145
146 // Shuts down and nulls out the reference to TopSites. 146 // Shuts down and nulls out the reference to TopSites.
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 351
352 scoped_ptr<content::MockResourceContext> resource_context_; 352 scoped_ptr<content::MockResourceContext> resource_context_;
353 353
354 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_; 354 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_;
355 355
356 // Weak pointer to a delegate for indicating that a profile was created. 356 // Weak pointer to a delegate for indicating that a profile was created.
357 Delegate* delegate_; 357 Delegate* delegate_;
358 }; 358 };
359 359
360 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 360 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW
« no previous file with comments | « trunk/src/chrome/browser/ui/toolbar/back_forward_menu_model_unittest.cc ('k') | trunk/src/chrome/test/base/testing_profile.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698