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

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

Issue 9467016: Get rid of WebKitContext. Only two out of six HTML5 related objects were in it and it was just a gl… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix bug Created 8 years, 10 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 | « chrome/test/base/testing_profile.h ('k') | content/browser/browser_context.cc » ('j') | 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 "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include "base/base_paths.h" 9 #include "base/base_paths.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 29 matching lines...) Expand all
40 #include "chrome/browser/sync/profile_sync_service_mock.h" 40 #include "chrome/browser/sync/profile_sync_service_mock.h"
41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" 41 #include "chrome/browser/ui/webui/chrome_url_data_manager.h"
42 #include "chrome/common/chrome_constants.h" 42 #include "chrome/common/chrome_constants.h"
43 #include "chrome/common/chrome_notification_types.h" 43 #include "chrome/common/chrome_notification_types.h"
44 #include "chrome/common/chrome_switches.h" 44 #include "chrome/common/chrome_switches.h"
45 #include "chrome/common/url_constants.h" 45 #include "chrome/common/url_constants.h"
46 #include "chrome/test/base/bookmark_load_observer.h" 46 #include "chrome/test/base/bookmark_load_observer.h"
47 #include "chrome/test/base/test_url_request_context_getter.h" 47 #include "chrome/test/base/test_url_request_context_getter.h"
48 #include "chrome/test/base/testing_pref_service.h" 48 #include "chrome/test/base/testing_pref_service.h"
49 #include "chrome/test/base/ui_test_utils.h" 49 #include "chrome/test/base/ui_test_utils.h"
50 #include "content/browser/in_process_webkit/webkit_context.h"
51 #include "content/browser/mock_resource_context.h" 50 #include "content/browser/mock_resource_context.h"
52 #include "content/public/browser/browser_thread.h" 51 #include "content/public/browser/browser_thread.h"
53 #include "content/public/browser/notification_service.h" 52 #include "content/public/browser/notification_service.h"
54 #include "net/base/cookie_monster.h" 53 #include "net/base/cookie_monster.h"
55 #include "net/url_request/url_request_context.h" 54 #include "net/url_request/url_request_context.h"
56 #include "net/url_request/url_request_context_getter.h" 55 #include "net/url_request/url_request_context_getter.h"
57 #include "net/url_request/url_request_test_util.h" 56 #include "net/url_request/url_request_test_util.h"
58 #include "testing/gmock/include/gmock/gmock.h" 57 #include "testing/gmock/include/gmock/gmock.h"
59 #include "webkit/database/database_tracker.h" 58 #include "webkit/database/database_tracker.h"
60 #include "webkit/fileapi/file_system_context.h" 59 #include "webkit/fileapi/file_system_context.h"
(...skipping 623 matching lines...) Expand 10 before | Expand all | Expand 10 after
684 } 683 }
685 684
686 base::Time TestingProfile::GetStartTime() const { 685 base::Time TestingProfile::GetStartTime() const {
687 return start_time_; 686 return start_time_;
688 } 687 }
689 688
690 ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() { 689 ProtocolHandlerRegistry* TestingProfile::GetProtocolHandlerRegistry() {
691 return protocol_handler_registry_.get(); 690 return protocol_handler_registry_.get();
692 } 691 }
693 692
694 WebKitContext* TestingProfile::GetOffTheRecordWebKitContext() {
695 return NULL;
696 }
697
698 FilePath TestingProfile::last_selected_directory() { 693 FilePath TestingProfile::last_selected_directory() {
699 return last_selected_directory_; 694 return last_selected_directory_;
700 } 695 }
701 696
702 void TestingProfile::set_last_selected_directory(const FilePath& path) { 697 void TestingProfile::set_last_selected_directory(const FilePath& path) {
703 last_selected_directory_ = path; 698 last_selected_directory_ = path;
704 } 699 }
705 700
706 PrefProxyConfigTracker* TestingProfile::GetProxyConfigTracker() { 701 PrefProxyConfigTracker* TestingProfile::GetProxyConfigTracker() {
707 if (!pref_proxy_config_tracker_.get()) { 702 if (!pref_proxy_config_tracker_.get()) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() { 757 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
763 return GetExtensionSpecialStoragePolicy(); 758 return GetExtensionSpecialStoragePolicy();
764 } 759 }
765 760
766 void TestingProfile::DestroyWebDataService() { 761 void TestingProfile::DestroyWebDataService() {
767 if (!web_data_service_.get()) 762 if (!web_data_service_.get())
768 return; 763 return;
769 764
770 web_data_service_->Shutdown(); 765 web_data_service_->Shutdown();
771 } 766 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/browser_context.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698