Fixed the upper guid issue in driver.

Currently content download only supports upper case guid. This CL
limits guid in download service to be upper case ascii chars.

In the future, we should consider the two guid approach to decouple
from content layer guid details.



Bug: 734818
Change-Id: Id03a234c0edb14c9ee7a66d5bb486cb1503e1840
Reviewed-on: https://chromium-review.googlesource.com/540679Reviewed-by: David Trainor <dtrainor@chromium.org>
Commit-Queue: Xing Liu <xingliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#481004}

components/download/internal/controller_impl.cc

@@ -634,6 +634,8 @@ void ControllerImpl::HandleStartDownloadResponse(
     model_->Remove(guid);
   }
 
+  if (callback.is_null())
+    return;
   base::ThreadTaskRunnerHandle::Get()->PostTask(
       FROM_HERE, base::Bind(callback, guid, result));
 }

components/download/internal/download_service_impl.cc

@@ -4,6 +4,7 @@
 
 #include "components/download/internal/download_service_impl.h"
 
+#include "base/strings/string_util.h"
 #include "components/download/internal/controller.h"
 #include "components/download/internal/startup_status.h"
 #include "components/download/internal/stats.h"
@@ -47,24 +48,28 @@ DownloadService::ServiceStatus DownloadServiceImpl::GetStatus() {
 void DownloadServiceImpl::StartDownload(const DownloadParams& download_params) {
   stats::LogServiceApiAction(download_params.client,
                              stats::ServiceApiAction::START_DOWNLOAD);
+  DCHECK_EQ(download_params.guid, base::ToUpperASCII(download_params.guid));
   controller_->StartDownload(download_params);
 }
 
 void DownloadServiceImpl::PauseDownload(const std::string& guid) {
   stats::LogServiceApiAction(controller_->GetOwnerOfDownload(guid),
                              stats::ServiceApiAction::PAUSE_DOWNLOAD);
+  DCHECK_EQ(guid, base::ToUpperASCII(guid));
   controller_->PauseDownload(guid);
 }
 
 void DownloadServiceImpl::ResumeDownload(const std::string& guid) {
   stats::LogServiceApiAction(controller_->GetOwnerOfDownload(guid),
                              stats::ServiceApiAction::RESUME_DOWNLOAD);
+  DCHECK_EQ(guid, base::ToUpperASCII(guid));
   controller_->ResumeDownload(guid);
 }
 
 void DownloadServiceImpl::CancelDownload(const std::string& guid) {
   stats::LogServiceApiAction(controller_->GetOwnerOfDownload(guid),
                              stats::ServiceApiAction::CANCEL_DOWNLOAD);
+  DCHECK_EQ(guid, base::ToUpperASCII(guid));
   controller_->CancelDownload(guid);
 }
 
@@ -73,6 +78,7 @@ void DownloadServiceImpl::ChangeDownloadCriteria(
     const SchedulingParams& params) {
   stats::LogServiceApiAction(controller_->GetOwnerOfDownload(guid),
                              stats::ServiceApiAction::CHANGE_CRITERIA);
+  DCHECK_EQ(guid, base::ToUpperASCII(guid));
   controller_->ChangeDownloadCriteria(guid, params);
 }
 

components/download/internal/download_service_impl_unittest.cc

@@ -8,6 +8,7 @@
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/string_util.h"
 #include "components/download/internal/startup_status.h"
 #include "components/download/internal/test/download_params_utils.h"
 #include "components/download/internal/test/mock_controller.h"
@@ -63,6 +64,9 @@ TEST_F(DownloadServiceImplTest, TestGetStatus) {
 
 TEST_F(DownloadServiceImplTest, TestApiPassThrough) {
   DownloadParams params = test::BuildBasicDownloadParams();
+  // TODO(xingliu): Remove the limitation of upper case guid in
+  // |download_params|, see http://crbug.com/734818.
+  params.guid = base::ToUpperASCII(params.guid);
   SchedulingParams scheduling_params;
   scheduling_params.priority = SchedulingParams::Priority::UI;
 

components/download/internal/scheduler/scheduler_impl.cc

@@ -41,7 +41,6 @@ SchedulerImpl::SchedulerImpl(TaskScheduler* task_scheduler,
       config_(config),
       download_clients_(clients),
       current_client_index_(0) {
-  DCHECK(!download_clients_.empty());
   DCHECK(task_scheduler_);
 }
 

components/download/public/download_params.h

@@ -131,6 +131,8 @@ struct DownloadParams {
   DownloadClient client;
 
   // A unique GUID that represents this download.  See |base::GenerateGUID()|.
+  // TODO(xingliu): guid in content download must be upper case, see
+  // http://crbug.com/734818.
   std::string guid;
 
   // A callback that will be notified if this download has been accepted and

components/download/public/download_service.h

@@ -75,7 +75,9 @@ class DownloadService : public KeyedService {
 
   // Sends the download to the service.  A callback to
   // |DownloadParams::callback| will be triggered once the download has been
-  // persisted and saved in the service
+  // persisted and saved in the service.
+  // TODO(xingliu): Remove the limitation of upper case guid in
+  // |download_params|, see http://crbug.com/734818.
   virtual void StartDownload(const DownloadParams& download_params) = 0;
 
   // Allows any feature to pause or resume downloads at will.  Paused downloads