Switch to use download GUID to indentify download items

chrome/browser/android/download/download_manager_service_unittest.cc

 // Copyright 2015 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/android/download/download_manager_service.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 18 matching lines @@
 
 class DownloadManagerServiceTest : public testing::Test {
  public:
   DownloadManagerServiceTest()
       : service_(
             new DownloadManagerService(base::android::AttachCurrentThread(),
                                        nullptr,
                                        &manager_)),
         finished_(false),
         success_(false) {
-    ON_CALL(manager_, GetDownload(_))
+    ON_CALL(manager_, GetDownloadByGuid(_))
         .WillByDefault(
-            ::testing::Invoke(this, &DownloadManagerServiceTest::GetDownload));
+            ::testing::Invoke(this,
+                              &DownloadManagerServiceTest::GetDownloadByGuid));
   }
 
   void OnResumptionDone(bool success) {
     finished_ = true;
     success_ = success;
   }
 
-  void StartDownload(int download_id) {
+  void StartDownload(const std::string& download_guid) {
     JNIEnv* env = base::android::AttachCurrentThread();
     service_->set_resume_callback_for_testing(base::Bind(
         &DownloadManagerServiceTest::OnResumptionDone, base::Unretained(this)));
     service_->ResumeDownload(
-        env, nullptr, download_id,
+        env, nullptr, 0, JavaParamRef<jstring>(
+            env, base::android::ConvertUTF8ToJavaString(
+                env, download_guid).obj()),
         base::android::ConvertUTF8ToJavaString(env, "test").obj());
     while (!finished_)
       message_loop_.RunUntilIdle();
   }
 
   void CreateDownloadItem(bool can_resume) {
     download_.reset(new content::MockDownloadItem());
     ON_CALL(*download_, CanResume())
         .WillByDefault(::testing::Return(can_resume));
   }
 
  protected:
-  content::DownloadItem* GetDownload(uint32_t) { return download_.get(); }
+  content::DownloadItem* GetDownloadByGuid(const std::string&) {
+    return download_.get();
+  }
 
   base::MessageLoop message_loop_;
   scoped_ptr<content::MockDownloadItem> download_;
   content::MockDownloadManager manager_;
   DownloadManagerService* service_;
   bool finished_;
   bool success_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadManagerServiceTest);
 };
 
 // Test that resumption will fail if no download item is found before times out.
 TEST_F(DownloadManagerServiceTest, ResumptionTimeOut) {
-  StartDownload(1);
+  StartDownload("0000");
   EXPECT_FALSE(success_);
 }
 
 // Test that resumption succeeds if the download item is found and can be
 // resumed.
 TEST_F(DownloadManagerServiceTest, ResumptionWithResumableItem) {
   CreateDownloadItem(true);
-  StartDownload(1);
+  StartDownload("0000");
   EXPECT_TRUE(success_);
 }
 
 // Test that resumption fails if the target download item is not resumable.
 TEST_F(DownloadManagerServiceTest, ResumptionWithNonResumableItem) {
   CreateDownloadItem(false);
-  StartDownload(1);
+  StartDownload("0000");
   EXPECT_FALSE(success_);
 }