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

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

Issue 15517005: Remove references to Profile from browser_context_keyed_service. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & style Created 7 years, 7 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 19 matching lines...) Expand all
30 } 30 }
31 31
32 namespace policy { 32 namespace policy {
33 class ProfilePolicyConnector; 33 class ProfilePolicyConnector;
34 } 34 }
35 35
36 namespace quota { 36 namespace quota {
37 class SpecialStoragePolicy; 37 class SpecialStoragePolicy;
38 } 38 }
39 39
40 class BrowserContextDependencyManager;
40 class CommandLine; 41 class CommandLine;
41 class ExtensionSpecialStoragePolicy; 42 class ExtensionSpecialStoragePolicy;
42 class HostContentSettingsMap; 43 class HostContentSettingsMap;
43 class PrefServiceSyncable; 44 class PrefServiceSyncable;
44 class ProfileDependencyManager;
45 class ProfileSyncService; 45 class ProfileSyncService;
46 class TemplateURLService; 46 class TemplateURLService;
47 class TestingPrefServiceSyncable; 47 class TestingPrefServiceSyncable;
48 48
49 class TestingProfile : public Profile { 49 class TestingProfile : public Profile {
50 public: 50 public:
51 // Profile directory name for the test user. This is "Default" on most 51 // Profile directory name for the test user. This is "Default" on most
52 // platforms but must be different on ChromeOS because a logged-in user cannot 52 // platforms but must be different on ChromeOS because a logged-in user cannot
53 // use "Default" as profile directory. 53 // use "Default" as profile directory.
54 // Browser- and UI tests should always use this to get to the user's profile 54 // Browser- and UI tests should always use this to get to the user's profile
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 // profile environment, this is invalid and the directory is managed by the 336 // profile environment, this is invalid and the directory is managed by the
337 // TestingProfileManager. 337 // TestingProfileManager.
338 base::ScopedTempDir temp_dir_; 338 base::ScopedTempDir temp_dir_;
339 // The path to this profile. This will be valid in either of the two above 339 // The path to this profile. This will be valid in either of the two above
340 // cases. 340 // cases.
341 base::FilePath profile_path_; 341 base::FilePath profile_path_;
342 342
343 // We keep a weak pointer to the dependency manager we want to notify on our 343 // We keep a weak pointer to the dependency manager we want to notify on our
344 // death. Defaults to the Singleton implementation but overridable for 344 // death. Defaults to the Singleton implementation but overridable for
345 // testing. 345 // testing.
346 ProfileDependencyManager* profile_dependency_manager_; 346 BrowserContextDependencyManager* profile_dependency_manager_;
347 347
348 scoped_ptr<content::MockResourceContext> resource_context_; 348 scoped_ptr<content::MockResourceContext> resource_context_;
349 349
350 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_; 350 scoped_ptr<policy::ProfilePolicyConnector> profile_policy_connector_;
351 351
352 // Weak pointer to a delegate for indicating that a profile was created. 352 // Weak pointer to a delegate for indicating that a profile was created.
353 Delegate* delegate_; 353 Delegate* delegate_;
354 }; 354 };
355 355
356 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 356 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698