Commit 5732f978 authored by David Benjamin's avatar David Benjamin Committed by Commit Bot

Trim unused fields from ProfileIOData::ProfileParams

Bug: 908955
Change-Id: I237b5be47f7f2518714c2f83f4f9d44a9060f605
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1906476
Commit-Queue: David Benjamin <davidben@chromium.org>
Commit-Queue: Matt Menke <mmenke@chromium.org>
Auto-Submit: David Benjamin <davidben@chromium.org>
Reviewed-by: default avatarMatt Menke <mmenke@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714329}
parent e5f79808
...@@ -220,8 +220,7 @@ void StartNSSInitOnIOThread(const AccountId& account_id, ...@@ -220,8 +220,7 @@ void StartNSSInitOnIOThread(const AccountId& account_id,
void ProfileIOData::InitializeOnUIThread(Profile* profile) { void ProfileIOData::InitializeOnUIThread(Profile* profile) {
DCHECK_CURRENTLY_ON(BrowserThread::UI); DCHECK_CURRENTLY_ON(BrowserThread::UI);
std::unique_ptr<ProfileParams> params(new ProfileParams); auto params = std::make_unique<ProfileParams>();
params->path = profile->GetPath();
params->cookie_settings = CookieSettingsFactory::GetForProfile(profile); params->cookie_settings = CookieSettingsFactory::GetForProfile(profile);
params->host_content_settings_map = params->host_content_settings_map =
...@@ -256,7 +255,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) { ...@@ -256,7 +255,6 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
} }
#endif #endif
params->profile = profile;
profile_params_ = std::move(params); profile_params_ = std::move(params);
scoped_refptr<base::SingleThreadTaskRunner> io_task_runner = scoped_refptr<base::SingleThreadTaskRunner> io_task_runner =
......
...@@ -89,8 +89,6 @@ class ProfileIOData { ...@@ -89,8 +89,6 @@ class ProfileIOData {
ProfileParams(); ProfileParams();
~ProfileParams(); ~ProfileParams();
base::FilePath path;
scoped_refptr<content_settings::CookieSettings> cookie_settings; scoped_refptr<content_settings::CookieSettings> cookie_settings;
scoped_refptr<HostContentSettingsMap> host_content_settings_map; scoped_refptr<HostContentSettingsMap> host_content_settings_map;
#if BUILDFLAG(ENABLE_EXTENSIONS) #if BUILDFLAG(ENABLE_EXTENSIONS)
...@@ -101,11 +99,6 @@ class ProfileIOData { ...@@ -101,11 +99,6 @@ class ProfileIOData {
std::string username_hash; std::string username_hash;
bool user_is_affiliated = false; bool user_is_affiliated = false;
#endif #endif
// The profile this struct was populated from. It's passed as a void* to
// ensure it's not accidently used on the IO thread. Before using it on the
// UI thread, call ProfileManager::IsValidProfile to ensure it's alive.
void* profile = nullptr;
}; };
ProfileIOData(); ProfileIOData();
......
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