Correct order-dependent argument evaluation in SelectConfigInternal().

media/blink/key_system_config_selector.cc

 // Copyright 2014 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 "key_system_config_selector.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 723 matching lines @@
         &config_state, &accumulated_configuration);
     switch (support) {
       case CONFIGURATION_NOT_SUPPORTED:
         continue;
       case CONFIGURATION_REQUIRES_PERMISSION:
         if (request->was_permission_requested) {
           DVLOG(2) << "Rejecting requested configuration because "
                    << "permission was denied.";
           continue;
         }
-        media_permission_->RequestPermission(
-            MediaPermission::PROTECTED_MEDIA_IDENTIFIER,
-            GURL(request->security_origin.toString()),
-            base::Bind(&KeySystemConfigSelector::OnPermissionResult,
-                       weak_factory_.GetWeakPtr(), base::Passed(&request)));
+        {
+          // Note: the GURL must not be constructed inline because
+          // base::Passed(&request) sets |request| to null.
+          GURL security_origin(request->security_origin.toString());
+          media_permission_->RequestPermission(
+              MediaPermission::PROTECTED_MEDIA_IDENTIFIER, security_origin,
+              base::Bind(&KeySystemConfigSelector::OnPermissionResult,
+                         weak_factory_.GetWeakPtr(), base::Passed(&request)));
+        }
         return;
       case CONFIGURATION_SUPPORTED:
         cdm_config.allow_distinctive_identifier =
             (accumulated_configuration.distinctiveIdentifier ==
              blink::WebMediaKeySystemConfiguration::Requirement::Required);
         cdm_config.allow_persistent_state =
             (accumulated_configuration.persistentState ==
              blink::WebMediaKeySystemConfiguration::Requirement::Required);
         cdm_config.use_hw_secure_codecs =
             config_state.AreHwSecureCodecsRequired();
@@ skipping 10 matching lines @@
 
 void KeySystemConfigSelector::OnPermissionResult(
     scoped_ptr<SelectionRequest> request,
     bool is_permission_granted) {
   request->was_permission_requested = true;
   request->is_permission_granted = is_permission_granted;
   SelectConfigInternal(request.Pass());
 }
 
 }  // namespace media