Commit 444ed75d authored by thestig@chromium.org's avatar thestig@chromium.org

Cleanup: Remove unused bits of TestingProfile.

Review URL: https://codereview.chromium.org/297193002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@273051 0039d316-1c4b-4281-b951-d872f2087c98
parent 05335dc6
...@@ -260,7 +260,6 @@ TestingProfile::TestingProfile( ...@@ -260,7 +260,6 @@ TestingProfile::TestingProfile(
resource_context_(NULL), resource_context_(NULL),
delegate_(delegate), delegate_(delegate),
policy_service_(policy_service.release()) { policy_service_(policy_service.release()) {
// If no profile path was supplied, create one. // If no profile path was supplied, create one.
if (profile_path_.empty()) { if (profile_path_.empty()) {
CreateTempProfileDir(); CreateTempProfileDir();
...@@ -832,18 +831,6 @@ content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() { ...@@ -832,18 +831,6 @@ content::BrowserPluginGuestManager* TestingProfile::GetGuestManager() {
return GuestViewManager::FromBrowserContext(this); return GuestViewManager::FromBrowserContext(this);
} }
std::wstring TestingProfile::GetName() {
return std::wstring();
}
std::wstring TestingProfile::GetID() {
return id_;
}
void TestingProfile::SetID(const std::wstring& id) {
id_ = id;
}
bool TestingProfile::IsSameProfile(Profile *p) { bool TestingProfile::IsSameProfile(Profile *p) {
return this == p; return this == p;
} }
......
...@@ -18,10 +18,6 @@ namespace content { ...@@ -18,10 +18,6 @@ namespace content {
class MockResourceContext; class MockResourceContext;
} }
namespace extensions {
class ExtensionPrefs;
}
namespace history { namespace history {
class TopSites; class TopSites;
} }
...@@ -45,8 +41,6 @@ class BrowserContextDependencyManager; ...@@ -45,8 +41,6 @@ class BrowserContextDependencyManager;
class ExtensionSpecialStoragePolicy; class ExtensionSpecialStoragePolicy;
class HostContentSettingsMap; class HostContentSettingsMap;
class PrefServiceSyncable; class PrefServiceSyncable;
class ProfileSyncService;
class TemplateURLService;
class TestingPrefServiceSyncable; class TestingPrefServiceSyncable;
class TestingProfile : public Profile { class TestingProfile : public Profile {
...@@ -309,17 +303,9 @@ class TestingProfile : public Profile { ...@@ -309,17 +303,9 @@ class TestingProfile : public Profile {
content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE; content::ProtocolHandlerScopedVector protocol_interceptors) OVERRIDE;
virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE; virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE; virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
virtual std::wstring GetName();
virtual void SetName(const std::wstring& name) {}
virtual std::wstring GetID();
virtual void SetID(const std::wstring& id);
void set_last_session_exited_cleanly(bool value) { void set_last_session_exited_cleanly(bool value) {
last_session_exited_cleanly_ = value; last_session_exited_cleanly_ = value;
} }
virtual void MergeResourceString(int message_id,
std::wstring* output_string) {}
virtual void MergeResourceInteger(int message_id, int* output_value) {}
virtual void MergeResourceBoolean(int message_id, bool* output_value) {}
virtual bool IsSameProfile(Profile *p) OVERRIDE; virtual bool IsSameProfile(Profile *p) OVERRIDE;
virtual base::Time GetStartTime() const OVERRIDE; virtual base::Time GetStartTime() const OVERRIDE;
virtual base::FilePath last_selected_directory() OVERRIDE; virtual base::FilePath last_selected_directory() OVERRIDE;
...@@ -387,8 +373,6 @@ class TestingProfile : public Profile { ...@@ -387,8 +373,6 @@ class TestingProfile : public Profile {
// request context. Currently, only the CookieMonster is hooked up. // request context. Currently, only the CookieMonster is hooked up.
scoped_refptr<net::URLRequestContextGetter> extensions_request_context_; scoped_refptr<net::URLRequestContextGetter> extensions_request_context_;
std::wstring id_;
bool incognito_; bool incognito_;
bool force_incognito_; bool force_incognito_;
scoped_ptr<Profile> incognito_profile_; scoped_ptr<Profile> incognito_profile_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment