| Index: chrome/browser/profiles/profile_io_data.cc
|
| ===================================================================
|
| --- chrome/browser/profiles/profile_io_data.cc (revision 92020)
|
| +++ chrome/browser/profiles/profile_io_data.cc (working copy)
|
| @@ -261,7 +261,7 @@
|
| params->proxy_config_service.reset(
|
| ProxyServiceFactory::CreateProxyConfigService(
|
| profile->GetProxyConfigTracker()));
|
| - params->profile_id = profile->GetRuntimeId();
|
| + params->profile = profile;
|
| profile_params_.reset(params.release());
|
| }
|
|
|
| @@ -273,7 +273,7 @@
|
| clear_local_state_on_exit(false),
|
| io_thread(NULL),
|
| notification_service(NULL),
|
| - profile_id(Profile::kInvalidProfileId) {}
|
| + profile(NULL) {}
|
| ProfileIOData::ProfileParams::~ProfileParams() {}
|
|
|
| ProfileIOData::ProfileIOData(bool is_incognito)
|
| @@ -410,7 +410,7 @@
|
| network_delegate_.reset(new ChromeNetworkDelegate(
|
| io_thread_globals->extension_event_router_forwarder.get(),
|
| profile_params_->extension_info_map,
|
| - profile_params_->profile_id,
|
| + profile_params_->profile,
|
| &enable_referrers_));
|
|
|
| dns_cert_checker_.reset(
|
|
|