Add invalid url failure to screencapture command

chrome/browser/chromeos/policy/remote_commands/device_command_screenshot_job.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/chromeos/policy/remote_commands/device_command_screenshot_job.h"
 
 #include <fstream>
 
 #include "ash/shell.h"
 #include "base/bind.h"
@@ skipping 124 matching lines @@
 bool DeviceCommandScreenshotJob::IsExpired(base::TimeTicks now) {
   return now > issued_time() + base::TimeDelta::FromMinutes(
                                    kCommandExpirationTimeInMinutes);
 }
 
 bool DeviceCommandScreenshotJob::ParseCommandPayload(
     const std::string& command_payload) {
   scoped_ptr<base::Value> root(base::JSONReader().ReadToValue(command_payload));
   if (!root.get())
     return false;
   base::DictionaryValue* payload;

[pneubeck (no reviews), 2015/05/12 08:54:12]

could be initialized to nullptr

[cschuet (SLOW), 2015/05/12 09:29:59]

Done.

   if (!root->GetAsDictionary(&payload))
     return false;
   std::string upload_url;
   if (!payload->GetString(kUploadUrlFieldName, &upload_url))
     return false;
   upload_url_ = GURL(upload_url);
-  DCHECK(upload_url_.is_valid()) << upload_url_ << " is not a valid URL";
   return true;
 }
 
 void DeviceCommandScreenshotJob::StoreScreenshot(
     size_t screen,
     scoped_refptr<base::RefCountedBytes> png_data) {
   screenshots_.insert(std::make_pair(screen, png_data));
   DCHECK_LT(0, num_pending_screenshots_);
   --num_pending_screenshots_;
 
@@ skipping 25 matching lines @@
     const CallbackWithResult& succeeded_callback,
     const CallbackWithResult& failed_callback) {
   succeeded_callback_ = succeeded_callback;
   failed_callback_ = failed_callback;
 
   upload_job_ = screenshot_delegate_->CreateUploadJob(upload_url_, this);
   DCHECK(upload_job_);
 
   aura::Window::Windows root_windows = ash::Shell::GetAllRootWindows();
 
+  // Immediately fail if the upload url is invalid.
+  if (!upload_url_.is_valid()) {
+    LOG(ERROR) << upload_url_ << " is not a valid URL.";
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE,
+        base::Bind(failed_callback_, base::Passed(make_scoped_ptr(
+                                         new Payload(FAILURE_INVALID_URL)))));
+    return;
+  }
+
   // Immediately fail if there are no attached screens.
   if (root_windows.size() == 0) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(failed_callback_, base::Passed(make_scoped_ptr(new Payload(
                                          FAILURE_SCREENSHOT_ACQUISITION)))));
+    return;
   }
 
   // Post tasks to the sequenced worker pool for taking screenshots on each
   // attached screen.
   num_pending_screenshots_ = root_windows.size();

[pneubeck (no reviews), 2015/05/12 08:54:12]

you're omitting this assignment now in case of (root_windows.size() == 0).

[cschuet (SLOW), 2015/05/12 09:29:59]

Acknowledged.

   for (size_t screen = 0; screen < root_windows.size(); ++screen) {
     aura::Window* root_window = root_windows[screen];
     gfx::Rect rect = root_window->bounds();
     screenshot_delegate_->TakeSnapshot(
         root_window, rect,
         base::Bind(&RunStoreScreenshotOnTaskRunner,
                    base::Bind(&DeviceCommandScreenshotJob::StoreScreenshot,
                               weak_ptr_factory_.GetWeakPtr(), screen),
                    base::ThreadTaskRunnerHandle::Get()));
   }
 }
 
 void DeviceCommandScreenshotJob::TerminateImpl() {
   weak_ptr_factory_.InvalidateWeakPtrs();
 }
 
 }  // namespace policy