Minor refactoring of SelectSettings results for consistency.

content/renderer/media/user_media_client_impl.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/renderer/media/user_media_client_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <utility>
@@ skipping 376 matching lines @@
 }
 
 void UserMediaClientImpl::FinalizeSelectVideoDeviceSourceSettings(
     int request_id,
     const blink::WebUserMediaRequest& user_media_request,
     std::unique_ptr<StreamControls> controls,
     const RequestSettings& request_settings,
     const VideoDeviceCaptureSourceSelectionResult& selection_result) {
   DCHECK(CalledOnValidThread());
   if (selection_result.HasValue()) {
-    controls->video.device_id = selection_result.device_id;
+    controls->video.device_id = selection_result.device_id();
   } else {
     // TODO(guidou): Abort the request in all cases where |selection_result|
     // has no value, as the spec mandates.
     // Currently, some applications rely on the nonstandard behavior of asking
     // for permission even if constraints cannot be satisfied or there are no
     // devices. Fix once the standard behavior ceases to be disruptive.
     // See http://crbug.com/690491.
     blink::WebString failed_constraint_name =
-        blink::WebString::fromASCII(selection_result.failed_constraint_name);
+        blink::WebString::fromASCII(selection_result.failed_constraint_name());
     blink::WebString device_id_constraint_name = blink::WebString::fromASCII(
         user_media_request.videoConstraints().basic().deviceId.name());
     if (failed_constraint_name.equals(device_id_constraint_name)) {
       GetUserMediaRequestFailed(user_media_request,
                                 MEDIA_DEVICE_CONSTRAINT_NOT_SATISFIED,
                                 failed_constraint_name);
       return;
     }
   }
   FinalizeRequestUserMedia(request_id, user_media_request, std::move(controls),
@@ skipping 829 matching lines @@
                          sources_waiting_for_callback_.end(), source);
   if (found != sources_waiting_for_callback_.end())
     OnTrackStarted(source, result, result_name);
 }
 
 void UserMediaClientImpl::OnDestruct() {
   delete this;
 }
 
 }  // namespace content