Reland "media: Refactor MojoMediaClient" with fix.

media/mojo/services/mojo_cdm_service_context.h

 // 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.
 
 #ifndef MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_
 #define MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_
 
 #include <stdint.h>
 
 #include <map>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "media/base/cdm_context.h"
-#include "media/base/media_export.h"
 
 namespace media {
 
 class MojoCdmService;
 
 // A class that creates, owns and manages all MojoCdmService instances.
 class MojoCdmServiceContext : public CdmContextProvider {
  public:
   MojoCdmServiceContext();
   ~MojoCdmServiceContext() override;
@@ skipping 19 matching lines @@
 
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MojoCdmServiceContext> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoCdmServiceContext);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_MOJO_CDM_SERVICE_CONTEXT_H_