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

 // 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.
 
 #ifndef CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <set>
 #include "base/basictypes.h"
 #include "base/debug/stack_trace.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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"
 
 class CommandLine;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class DesktopNotificationService;
 class ExtensionInfoMap;
 class HostContentSettingsMap;
 class HostZoomMap;
 class IOThread;
+class Profile;
 class ProtocolHandlerRegistry;
 
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 
 namespace net {
 class DnsCertProvenanceChecker;
 class NetLog;
 class ProxyConfigService;
@@ skipping 103 matching lines @@
     scoped_refptr<fileapi::FileSystemContext> file_system_context;
     scoped_refptr<quota::QuotaManager> quota_manager;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
     DesktopNotificationService* notification_service;
     base::WeakPtr<prerender::PrerenderManager> prerender_manager;
     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
     // 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;
-    // 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);
   virtual ~ProfileIOData();
 
   void InitializeProfileParams(Profile* profile);
   void ApplyProfileParamsToContext(ChromeURLRequestContext* context) const;
 
   // Lazy initializes the ProfileIOData object the first time a request context
   // is requested. The lazy logic is implemented here. The actual initialization
@@ skipping 110 matching lines @@
   // Weak pointers to the request contexts. Only valid after LazyInitialize.
   // These are weak so that they don't hold a reference to the RequestContext,
   // because that holds a reference back to ProfileIOData.
   mutable base::WeakPtr<ChromeURLRequestContext>
       weak_extensions_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_