| Index: chrome/browser/profiles/profile_io_data.h
|
| diff --git a/chrome/browser/profiles/profile_io_data.h b/chrome/browser/profiles/profile_io_data.h
|
| index 65a94f6b17a34114cf390b1a153695cc3d7d67ca..e255875caf8da9b4e4b0a889c5d40134d8557c72 100644
|
| --- a/chrome/browser/profiles/profile_io_data.h
|
| +++ b/chrome/browser/profiles/profile_io_data.h
|
| @@ -206,10 +206,8 @@ class ProfileIOData {
|
| scoped_ptr<net::URLRequestJobFactory::Interceptor>
|
| protocol_handler_interceptor;
|
|
|
| - // We need to initialize the ProxyConfigService from the UI thread
|
| - // because on linux it relies on initializing things through gconf,
|
| - // and needs to be on the main thread.
|
| - scoped_ptr<net::ProxyConfigService> proxy_config_service;
|
| + // Used on the UI thread to return a pointer to the Profile.
|
| + base::Callback<Profile*(void)> profile_getter;
|
| // 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.
|
|
|