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

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

Issue 10546083: Convert ProtocolHandlerRegistry to be a ProfileKeyedService. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Update ProtocolHandlerRegistry to be a ProfileKeyedService in lieu of a refcounted pointer. Created 8 years, 6 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
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 #pragma once 7 #pragma once
8 8
9 #include <string> 9 #include <string>
10 10
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 scoped_ptr<FaviconService> favicon_service_; 271 scoped_ptr<FaviconService> favicon_service_;
272 272
273 // The history service. Only created if CreateHistoryService is invoked. 273 // The history service. Only created if CreateHistoryService is invoked.
274 scoped_refptr<HistoryService> history_service_; 274 scoped_refptr<HistoryService> history_service_;
275 275
276 // The BookmarkModel. Only created if CreateBookmarkModel is invoked. 276 // The BookmarkModel. Only created if CreateBookmarkModel is invoked.
277 scoped_ptr<BookmarkModel> bookmark_bar_model_; 277 scoped_ptr<BookmarkModel> bookmark_bar_model_;
278 278
279 // The ProtocolHandlerRegistry. Only created if CreateProtocolHandlerRegistry 279 // The ProtocolHandlerRegistry. Only created if CreateProtocolHandlerRegistry
280 // is invoked. 280 // is invoked.
281 scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry_; 281 ProtocolHandlerRegistry* protocol_handler_registry_;
282 282
283 // The AutocompleteClassifier. Only created if CreateAutocompleteClassifier 283 // The AutocompleteClassifier. Only created if CreateAutocompleteClassifier
284 // is invoked. 284 // is invoked.
285 scoped_ptr<AutocompleteClassifier> autocomplete_classifier_; 285 scoped_ptr<AutocompleteClassifier> autocomplete_classifier_;
286 286
287 // The policy service. Lazily created as a stub. 287 // The policy service. Lazily created as a stub.
288 scoped_ptr<policy::PolicyService> policy_service_; 288 scoped_ptr<policy::PolicyService> policy_service_;
289 289
290 // Internally, this is a TestURLRequestContextGetter that creates a dummy 290 // Internally, this is a TestURLRequestContextGetter that creates a dummy
291 // request context. Currently, only the CookieMonster is hooked up. 291 // request context. Currently, only the CookieMonster is hooked up.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 // testing. 326 // testing.
327 ProfileDependencyManager* profile_dependency_manager_; 327 ProfileDependencyManager* profile_dependency_manager_;
328 328
329 scoped_ptr<content::MockResourceContext> resource_context_; 329 scoped_ptr<content::MockResourceContext> resource_context_;
330 330
331 // Weak pointer to a delegate for indicating that a profile was created. 331 // Weak pointer to a delegate for indicating that a profile was created.
332 Delegate* delegate_; 332 Delegate* delegate_;
333 }; 333 };
334 334
335 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 335 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698