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

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

Issue 9416070: Move creation and ownership of HostZoomMap to content instead of having every embedder do this. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix mac/cros browsertests 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/host_zoom_map_impl.h » ('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 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 #include "webkit/quota/mock_quota_manager.h" 62 #include "webkit/quota/mock_quota_manager.h"
63 #include "webkit/quota/quota_manager.h" 63 #include "webkit/quota/quota_manager.h"
64 64
65 #if defined(OS_CHROMEOS) 65 #if defined(OS_CHROMEOS)
66 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 66 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
67 #endif // defined(OS_CHROMEOS) 67 #endif // defined(OS_CHROMEOS)
68 68
69 using base::Time; 69 using base::Time;
70 using content::BrowserThread; 70 using content::BrowserThread;
71 using content::DownloadManager; 71 using content::DownloadManager;
72 using content::HostZoomMap;
73 using testing::NiceMock; 72 using testing::NiceMock;
74 using testing::Return; 73 using testing::Return;
75 74
76 namespace { 75 namespace {
77 76
78 // Task used to make sure history has finished processing a request. Intended 77 // Task used to make sure history has finished processing a request. Intended
79 // for use with BlockUntilHistoryProcessesPendingRequests. 78 // for use with BlockUntilHistoryProcessesPendingRequests.
80 79
81 class QuittingHistoryDBTask : public HistoryDBTask { 80 class QuittingHistoryDBTask : public HistoryDBTask {
82 public: 81 public:
(...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after
649 } 648 }
650 return geolocation_permission_context_.get(); 649 return geolocation_permission_context_.get();
651 } 650 }
652 651
653 content::SpeechInputPreferences* TestingProfile::GetSpeechInputPreferences() { 652 content::SpeechInputPreferences* TestingProfile::GetSpeechInputPreferences() {
654 if (!speech_input_preferences_.get()) 653 if (!speech_input_preferences_.get())
655 speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs()); 654 speech_input_preferences_ = new ChromeSpeechInputPreferences(GetPrefs());
656 return speech_input_preferences_.get(); 655 return speech_input_preferences_.get();
657 } 656 }
658 657
659 HostZoomMap* TestingProfile::GetHostZoomMap() {
660 return NULL;
661 }
662
663 std::wstring TestingProfile::GetName() { 658 std::wstring TestingProfile::GetName() {
664 return std::wstring(); 659 return std::wstring();
665 } 660 }
666 661
667 std::wstring TestingProfile::GetID() { 662 std::wstring TestingProfile::GetID() {
668 return id_; 663 return id_;
669 } 664 }
670 665
671 void TestingProfile::SetID(const std::wstring& id) { 666 void TestingProfile::SetID(const std::wstring& id) {
672 id_ = id; 667 id_ = id;
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() { 758 quota::SpecialStoragePolicy* TestingProfile::GetSpecialStoragePolicy() {
764 return GetExtensionSpecialStoragePolicy(); 759 return GetExtensionSpecialStoragePolicy();
765 } 760 }
766 761
767 void TestingProfile::DestroyWebDataService() { 762 void TestingProfile::DestroyWebDataService() {
768 if (!web_data_service_.get()) 763 if (!web_data_service_.get())
769 return; 764 return;
770 765
771 web_data_service_->Shutdown(); 766 web_data_service_->Shutdown();
772 } 767 }
OLDNEW
« no previous file with comments | « chrome/test/base/testing_profile.h ('k') | content/browser/host_zoom_map_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698