OnDownloadStarted takes DownloadItem* instead of DownloadId

content/public/test/download_test_observer.cc

 // Copyright (c) 2012 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 "content/public/test/download_test_observer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 371 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&DownloadTestFlushObserver::PingFileThread, this, cycle));
   } else {
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE, MessageLoop::QuitClosure());
   }
 }
 
 DownloadTestItemCreationObserver::DownloadTestItemCreationObserver()
-    : download_id_(DownloadId::Invalid()),
+    : download_id_(DownloadId::Invalid().local()),
       error_(net::OK),
       called_back_count_(0),
       waiting_(false) {
 }
 
 DownloadTestItemCreationObserver::~DownloadTestItemCreationObserver() {
 }
 
 void DownloadTestItemCreationObserver::WaitForDownloadItemCreation() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (called_back_count_ == 0) {
     waiting_ = true;
     RunMessageLoop();
     waiting_ = false;
   }
 }
 
 void DownloadTestItemCreationObserver::DownloadItemCreationCallback(
-    DownloadId download_id, net::Error error) {
+    DownloadItem* item, net::Error error) {

[sky, 2012/10/09 16:16:11]

nit: when you wrap, each param on its own line.

[benjhayden, 2012/10/09 20:57:18]

Done.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  download_id_ = download_id;
+  if (item)
+    download_id_ = item->GetId();
   error_ = error;
   ++called_back_count_;
   DCHECK_EQ(1u, called_back_count_);
 
   if (waiting_)
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content