Extract CdmManager from MojoCdmService.

media/gpu/BUILD.gn

 # Copyright 2016 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.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//media/gpu/args.gni")
 import("//media/media_options.gni")
 import("//testing/test.gni")
 
@@ skipping 205 matching lines @@
       sources += [
         "android/media_codec_video_decoder.cc",
         "android/media_codec_video_decoder.h",
       ]
     }
 
     # TODO(xhwang): This is needed for AVDA to access the CDM directly.
     # Remove this dependency after VDAs are also running as part of the mojo
     # media service. See http://crbug.com/522298
     if (mojo_media_host == "gpu") {
-      deps += [ "//media/mojo/services" ]
+      deps += [ "//media:cdm_manager" ]
     }
   }
 
   if (is_chromeos || is_win) {
     sources += [
       "accelerated_video_decoder.h",
       "h264_decoder.cc",
       "h264_decoder.h",
       "h264_dpb.cc",
       "h264_dpb.h",
@@ skipping 311 matching lines @@
     "//base/test:test_support",
     "//gpu:test_support",
     "//media/gpu/ipc/common",
     "//media/gpu/ipc/service",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/gfx:test_support",
     "//ui/gfx/geometry",
   ]
 }