OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/testing_profile.h" | 5 #include "chrome/test/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 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
673 | 673 |
674 SpellCheckHost* TestingProfile::GetSpellCheckHost() { | 674 SpellCheckHost* TestingProfile::GetSpellCheckHost() { |
675 return NULL; | 675 return NULL; |
676 } | 676 } |
677 | 677 |
678 WebKitContext* TestingProfile::GetWebKitContext() { | 678 WebKitContext* TestingProfile::GetWebKitContext() { |
679 if (webkit_context_ == NULL) { | 679 if (webkit_context_ == NULL) { |
680 webkit_context_ = new WebKitContext( | 680 webkit_context_ = new WebKitContext( |
681 IsOffTheRecord(), GetPath(), | 681 IsOffTheRecord(), GetPath(), |
682 GetExtensionSpecialStoragePolicy(), | 682 GetExtensionSpecialStoragePolicy(), |
683 false); | 683 false, NULL, NULL); |
684 } | 684 } |
685 return webkit_context_; | 685 return webkit_context_; |
686 } | 686 } |
687 | 687 |
688 WebKitContext* TestingProfile::GetOffTheRecordWebKitContext() { | 688 WebKitContext* TestingProfile::GetOffTheRecordWebKitContext() { |
689 return NULL; | 689 return NULL; |
690 } | 690 } |
691 | 691 |
692 NTPResourceCache* TestingProfile::GetNTPResourceCache() { | 692 NTPResourceCache* TestingProfile::GetNTPResourceCache() { |
693 if (!ntp_resource_cache_.get()) | 693 if (!ntp_resource_cache_.get()) |
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
790 } | 790 } |
791 | 791 |
792 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) | 792 DerivedTestingProfile::DerivedTestingProfile(Profile* profile) |
793 : original_profile_(profile) {} | 793 : original_profile_(profile) {} |
794 | 794 |
795 DerivedTestingProfile::~DerivedTestingProfile() {} | 795 DerivedTestingProfile::~DerivedTestingProfile() {} |
796 | 796 |
797 ProfileId DerivedTestingProfile::GetRuntimeId() { | 797 ProfileId DerivedTestingProfile::GetRuntimeId() { |
798 return original_profile_->GetRuntimeId(); | 798 return original_profile_->GetRuntimeId(); |
799 } | 799 } |
OLD | NEW |