Media Remoting Clean-up: Less-redundant naming, style consistency, etc.

media/remoting/remoting_cdm_context.cc

 // 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.
 
 #include "media/remoting/remoting_cdm_context.h"
 
 #include "media/remoting/remoting_cdm.h"
-#include "media/remoting/remoting_source_impl.h"
+#include "media/remoting/shared_session.h"
 
 namespace media {
+namespace remoting {
 
 namespace {
 // Used as an identifier for RemotingCdmContext::From().
 void* const kClassIdentifier = const_cast<void**>(&kClassIdentifier);
 }  // namespace
 
 // TODO(xjz): Merge this with erickung's implementation.
 RemotingCdmContext::RemotingCdmContext(RemotingCdm* remoting_cdm)
     : remoting_cdm_(remoting_cdm) {}
 
@@ skipping 12 matching lines @@
 
 int RemotingCdmContext::GetCdmId() const {
   // TODO(xjz): Merge with erickung's implementation.
   return CdmContext::kInvalidCdmId;
 }
 
 void* RemotingCdmContext::GetClassIdentifier() const {
   return kClassIdentifier;
 }
 
-RemotingSourceImpl* RemotingCdmContext::GetRemotingSource() {
-  return remoting_cdm_->GetRemotingSource();
+SharedSession* RemotingCdmContext::GetSharedSession() const {
+  return remoting_cdm_->session();
 }
 
+}  // namespace remoting
 }  // namespace media