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.h

Index: chrome/browser/profiles/profile_io_data.h
===================================================================
--- chrome/browser/profiles/profile_io_data.h	(revision 92309)
+++ chrome/browser/profiles/profile_io_data.h	(working copy)
@@ -16,7 +16,6 @@
 #include "base/synchronization/lock.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/prefs/pref_member.h"
-#include "chrome/browser/profiles/profile.h"
 #include "content/browser/resource_context.h"
 #include "net/base/cookie_monster.h"
 
@@ -28,6 +27,7 @@
 class HostContentSettingsMap;
 class HostZoomMap;
 class IOThread;
+class Profile;
 class ProtocolHandlerRegistry;
 
 namespace fileapi {
@@ -170,8 +170,10 @@
     // 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;
-    // The profile this struct was populated from.
-    ProfileId profile_id;
+    // 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;
   };
 
   explicit ProfileIOData(bool is_incognito);