Move webkit/renderer/media/android/ to content/renderer/media/android/.

content/renderer/media/android/media_source_delegate.cc

 // 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.
 
-#include "webkit/renderer/media/android/media_source_delegate.h"
+#include "content/renderer/media/android/media_source_delegate.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
+#include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/bind_to_loop.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/media_log.h"
 #include "media/filters/chunk_demuxer.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebMediaSource.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
-#include "webkit/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "webkit/renderer/media/webmediaplayer_util.h"
 #include "webkit/renderer/media/webmediasourceclient_impl.h"
 
 using media::DemuxerStream;
 using media::MediaPlayerHostMsg_DemuxerReady_Params;
 using media::MediaPlayerHostMsg_ReadFromDemuxerAck_Params;
+using webkit_media::ConvertToWebTimeRanges;
+using webkit_media::PipelineErrorToNetworkState;
+using webkit_media::WebMediaSourceClientImpl;
 using WebKit::WebMediaPlayer;
 using WebKit::WebString;
 
 namespace {
 
 // The size of the access unit to transfer in an IPC in case of MediaSource.
 // 16: approximately 250ms of content in 60 fps movies.
 const size_t kAccessUnitSizeForMediaSource = 16;
 
 const uint8 kVorbisPadding[] = { 0xff, 0xff, 0xff, 0xff };
 
 }  // namespace
 
-namespace webkit_media {
+namespace content {
 
 #define BIND_TO_RENDER_LOOP(function) \
   media::BindToLoop(base::MessageLoopProxy::current(), \
                     base::Bind(function, weak_this_.GetWeakPtr()))
 
 #define BIND_TO_RENDER_LOOP_1(function, arg1) \
   media::BindToLoop(base::MessageLoopProxy::current(), \
                     base::Bind(function, weak_this_.GetWeakPtr(), arg1))
 
 #define BIND_TO_RENDER_LOOP_2(function, arg1, arg2) \
@@ skipping 384 matching lines @@
   need_key_cb_.Run(session_id, type, init_data.Pass(), init_data_size);
 }
 
 scoped_ptr<media::TextTrack> MediaSourceDelegate::OnAddTextTrack(
     media::TextKind kind,
     const std::string& label,
     const std::string& language) {
   return scoped_ptr<media::TextTrack>();
 }
 
-}  // namespace webkit_media
+}  // namespace content