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

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

Issue 11587003: Make ChromeGeolocationPermissionContextFactory a ProfileKeyedServiceFactory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Android compile error. Add GetInstance() call to ProfileDependencyManager. Created 8 years 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 314 matching lines...) Expand 10 before | Expand all | Expand 10 after
325 325
326 std::wstring id_; 326 std::wstring id_;
327 327
328 bool incognito_; 328 bool incognito_;
329 scoped_ptr<Profile> incognito_profile_; 329 scoped_ptr<Profile> incognito_profile_;
330 330
331 // Did the last session exit cleanly? Default is true. 331 // Did the last session exit cleanly? Default is true.
332 bool last_session_exited_cleanly_; 332 bool last_session_exited_cleanly_;
333 333
334 scoped_refptr<HostContentSettingsMap> host_content_settings_map_; 334 scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
335 scoped_refptr<content::GeolocationPermissionContext>
336 geolocation_permission_context_;
337 335
338 FilePath last_selected_directory_; 336 FilePath last_selected_directory_;
339 scoped_refptr<history::TopSites> top_sites_; // For history and thumbnails. 337 scoped_refptr<history::TopSites> top_sites_; // For history and thumbnails.
340 338
341 scoped_refptr<ExtensionSpecialStoragePolicy> 339 scoped_refptr<ExtensionSpecialStoragePolicy>
342 extension_special_storage_policy_; 340 extension_special_storage_policy_;
343 341
344 // The proxy prefs tracker. 342 // The proxy prefs tracker.
345 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_; 343 scoped_ptr<PrefProxyConfigTracker> pref_proxy_config_tracker_;
346 344
(...skipping 10 matching lines...) Expand all
357 // testing. 355 // testing.
358 ProfileDependencyManager* profile_dependency_manager_; 356 ProfileDependencyManager* profile_dependency_manager_;
359 357
360 scoped_ptr<content::MockResourceContext> resource_context_; 358 scoped_ptr<content::MockResourceContext> resource_context_;
361 359
362 // Weak pointer to a delegate for indicating that a profile was created. 360 // Weak pointer to a delegate for indicating that a profile was created.
363 Delegate* delegate_; 361 Delegate* delegate_;
364 }; 362 };
365 363
366 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_ 364 #endif // CHROME_TEST_BASE_TESTING_PROFILE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698