Get rid of the ProfileId. It was added for ceee. I reverted the original change, since it led to ...

chrome/browser/profiles/profile_io_data.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/profiles/profile_io_data.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 244 matching lines @@
       DesktopNotificationServiceFactory::GetForProfile(profile);
   prerender::PrerenderManager* prerender_manager =
       profile->GetPrerenderManager();
   if (prerender_manager)
     params->prerender_manager = prerender_manager->AsWeakPtr();
   params->protocol_handler_registry = profile->GetProtocolHandlerRegistry();
 
   params->proxy_config_service.reset(
       ProxyServiceFactory::CreateProxyConfigService(
           profile->GetProxyConfigTracker()));
-  params->profile_id = profile->GetRuntimeId();
+  params->profile = profile;
   profile_params_.reset(params.release());
 }
 
 ProfileIOData::RequestContext::RequestContext() {}
 ProfileIOData::RequestContext::~RequestContext() {}
 
 ProfileIOData::AppRequestContext::AppRequestContext(const std::string& app_id)
     : app_id_(app_id) {}
 ProfileIOData::AppRequestContext::~AppRequestContext() {
   DCHECK(ContainsKey(profile_io_data()->app_request_context_map_, app_id_));
@@ skipping 10 matching lines @@
     net::HttpTransactionFactory* http_factory) {
   http_factory_.reset(http_factory);
   set_http_transaction_factory(http_factory);
 }
 
 ProfileIOData::ProfileParams::ProfileParams()
     : is_incognito(false),
       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)
     : initialized_(false),
       ALLOW_THIS_IN_INITIALIZER_LIST(resource_context_(this)) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 }
 
 ProfileIOData::~ProfileIOData() {
   // If we have never initialized ProfileIOData, then Handle may hold the only
@@ skipping 124 matching lines @@
   extensions_request_context_ = new RequestContext;
   weak_extensions_request_context_ = extensions_request_context_->GetWeakPtr();
 
   profile_params_->appcache_service->set_request_context(main_request_context_);
 
   chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend);
 
   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(
       CreateDnsCertProvenanceChecker(io_thread_globals->dnsrr_resolver.get(),
                                      main_request_context_));
 
   proxy_service_.reset(
       ProxyServiceFactory::CreateProxyService(
           io_thread->net_log(),
           io_thread_globals->proxy_script_fetcher_context.get(),
@@ skipping 87 matching lines @@
   context->set_blob_storage_context(profile_params_->blob_storage_context);
   context->set_file_system_context(profile_params_->file_system_context);
   context->set_extension_info_map(profile_params_->extension_info_map);
 }
 
 void ProfileIOData::ShutdownOnUIThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   enable_referrers_.Destroy();
   clear_local_state_on_exit_.Destroy();
 }