sql::MetaTable.next_download_id, DownloadManager::GetNextId()

chrome/browser/profiles/profile_io_data.cc

Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index 969560b2c0237ac52e5c1e545e3d138b7d0d1b97..e3a7d9a97524156e19ef43cb1bc6655335ab8e6e 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -191,6 +191,8 @@ void ProfileIOData::InitializeProfileParams(Profile* profile) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   PrefService* pref_service = profile->GetPrefs();
 
+  next_download_id_thunk_ = profile->GetDownloadManager()->GetNextIdThunk();

[Randy Smith (Not in Mondays), 2011/07/28 21:03:16]

Why is this in ProfileIOData as well as ResourceContext?  Is it used from
ProfileIOData, and if so, can a resource_context_ indirection be substituted?

[benjhayden, 2011/08/03 17:44:46]

Yes, next_download_id_thunk_ is used in LazyInitialize(), which runs on the IO
thread so it can't GetDownloadManager() there.
Nothing accesses next_download_id_thunk_ through ProfileIOData's public
interface, so I removed that public method.

+
   scoped_ptr<ProfileParams> params(new ProfileParams);
   params->is_incognito = profile->IsOffTheRecord();
   params->clear_local_state_on_exit =
@@ -503,6 +505,9 @@ void ProfileIOData::LazyInitialize() const {
   resource_context_.SetUserData(NULL, const_cast<ProfileIOData*>(this));
   resource_context_.set_media_observer(
       io_thread_globals->media.media_internals.get());
+  resource_context_.SetUserData(reinterpret_cast<void*>(
+      BASE_HASH_NAMESPACE::hash<std::string>()("next_download_id_thunk")),
+      &next_download_id_thunk_);

[Randy Smith (Not in Mondays), 2011/07/28 21:03:16]

I presume that the whole nasty reinterpret_cast<> business is because we can't
include download_manager.h in the ResourceContext declaration because that's in
content?  If so, put a TODO here to pull it back out once download_manager.h is
moved into content.

(What I'd *like* to say is that you should just include download_manager.h in
the ResourceContext header file, and jam can remove it when he does the move,
but that probably requires pulling him into this review and modifying the
exceptions file, and it probably just makes more sense to clean up once he's
done.)

[benjhayden, 2011/08/03 17:44:46]

Done.

 
   LazyInitializeInternal(profile_params_.get());