diff options
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/live_sync/profile_sync_service_test_harness.cc | 1 | ||||
-rw-r--r-- | chrome/test/testing_profile.cc | 5 | ||||
-rw-r--r-- | chrome/test/testing_profile.h | 7 | ||||
-rw-r--r-- | chrome/test/ui_test_utils.cc | 1 |
4 files changed, 10 insertions, 4 deletions
diff --git a/chrome/test/live_sync/profile_sync_service_test_harness.cc b/chrome/test/live_sync/profile_sync_service_test_harness.cc index 4bee1ce..26fff8b 100644 --- a/chrome/test/live_sync/profile_sync_service_test_harness.cc +++ b/chrome/test/live_sync/profile_sync_service_test_harness.cc @@ -4,6 +4,7 @@ #include "base/message_loop.h" #include "chrome/browser/browser.h" +#include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/test/testing_profile.cc b/chrome/test/testing_profile.cc index f412d90..94ddf97 100644 --- a/chrome/test/testing_profile.cc +++ b/chrome/test/testing_profile.cc @@ -10,6 +10,7 @@ #include "chrome/browser/dom_ui/ntp_resource_cache.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/net/url_request_context_getter.h" +#include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/notification_service.h" @@ -274,6 +275,10 @@ void TestingProfile::CreateRequestContext() { request_context_ = new TestURLRequestContextGetter(); } +void TestingProfile::set_session_service(SessionService* session_service) { + session_service_ = session_service; +} + NTPResourceCache* TestingProfile::GetNTPResourceCache() { if (!ntp_resource_cache_.get()) ntp_resource_cache_.reset(new NTPResourceCache(this)); diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h index 05db3a9..835fbc4 100644 --- a/chrome/test/testing_profile.h +++ b/chrome/test/testing_profile.h @@ -18,10 +18,11 @@ #include "chrome/browser/net/url_request_context_getter.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/browser/sessions/session_service.h" #include "chrome/common/pref_service.h" #include "net/base/cookie_monster.h" +class SessionService; + class TestingProfile : public Profile { public: TestingProfile(); @@ -187,9 +188,7 @@ class TestingProfile : public Profile { return host_content_settings_map_.get(); } virtual HostZoomMap* GetHostZoomMap() { return NULL; } - void set_session_service(SessionService* session_service) { - session_service_ = session_service; - } + void set_session_service(SessionService* session_service); virtual SessionService* GetSessionService() { return session_service_.get(); } virtual void ShutdownSessionService() {} virtual bool HasSessionService() const { diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index 3dc51ec..6eac7fa 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -17,6 +17,7 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/profile.h" #include "chrome/browser/renderer_host/render_process_host.h" +#include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" |