Using GURL in place of std::string for destination_url

media/media_cdm_adapter.gyp

 # Copyright 2013 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.
 
 # This file defines a common base target for all CDM adapter implementations.
 # We use 'direct_dependent_settings' to override target type and settings so
 # that all CDM adapter implementations have the correct type and settings
 # automatically.
 #
 # WARNING: Keep 'cdmadapter' target out of media.gyp. /build/all.gyp:All depends
 # directly on media.gyp:*. If 'cdmadapter' is defined in media.gyp, then
 # 'direct_dependent_settings' will be applied to 'All' target and bad
 # things happen, e.g. the type of 'All' target becomes a plugin on Mac.
 {
   'conditions': [
     ['enable_pepper_cdms==1', {
       'targets': [
         {
           'target_name': 'cdmadapter',
           'type': 'none',
+          'dependencies': [
+            '../url/url.gyp:url_lib',

[xhwang, 2014/05/27 16:33:45]

Can you try to add this dependency on "clearkeycdm" target at:

https://code.google.com/p/chromium/codesearch#chromium/src/media/media_cdm.gy...

[ddorwin, 2014/05/27 17:00:14]

And it shouldn't be here.

The issue is that clearkeycdm reuses aes_decryptor, which now hwas the GURL
dependency. However, this adapter is independent of that code (and thus
media_keys.h and GURL).

+          ],
           'direct_dependent_settings': {
             'sources': [
               'cdm/ppapi/api/content_decryption_module.h',
               'cdm/ppapi/cdm_adapter.cc',
               'cdm/ppapi/cdm_adapter.h',
               'cdm/ppapi/cdm_file_io_impl.cc',
               'cdm/ppapi/cdm_file_io_impl.h',
               'cdm/ppapi/cdm_helpers.cc',
               'cdm/ppapi/cdm_helpers.h',
               'cdm/ppapi/cdm_logging.cc',
@@ skipping 27 matching lines @@
                   'DYLIB_INSTALL_NAME_BASE': '@loader_path',
                 },
               }],
             ],
           },
         },
       ],
     }],
   ],
 }