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

content/renderer/render_view_impl.cc

 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h"
 
 #include <algorithm>
 #include <cmath>
 
 #include "base/auto_reset.h"
@@ skipping 207 matching lines @@
 
 #if defined(OS_ANDROID)
 #include <cpu-features.h>
 
 #include "content/common/android/device_telephony_info.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/renderer/android/address_detector.h"
 #include "content/renderer/android/content_detector.h"
 #include "content/renderer/android/email_detector.h"
 #include "content/renderer/android/phone_number_detector.h"
-#include "content/renderer/media/stream_texture_factory_impl_android.h"
-#include "content/renderer/media/webmediaplayer_proxy_impl_android.h"
+#include "content/renderer/media/android/stream_texture_factory_android.h"
+#include "content/renderer/media/android/webmediaplayer_android.h"
+#include "content/renderer/media/android/webmediaplayer_manager_android.h"
+#include "content/renderer/media/android/webmediaplayer_proxy_android.h"
 #include "third_party/WebKit/public/web/WebHitTestResult.h"
 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
 #include "third_party/WebKit/public/platform/WebFloatRect.h"
 #include "ui/gfx/rect_f.h"
-#include "webkit/renderer/media/android/webmediaplayer_android.h"
-#include "webkit/renderer/media/android/webmediaplayer_manager_android.h"
 
 #if defined(GOOGLE_TV)
 #include "content/renderer/media/rtc_video_decoder_bridge_tv.h"
 #include "content/renderer/media/rtc_video_decoder_factory_tv.h"
 #endif
 
 #elif defined(OS_WIN)
 // TODO(port): these files are currently Windows only because they concern:
 //   * theming
 #include "ui/native_theme/native_theme_win.h"
@@ skipping 657 matching lines @@
   if (!media_stream_dispatcher_)
     media_stream_dispatcher_ = new MediaStreamDispatcher(this);
 #endif
 
   new MHTMLGenerator(this);
 #if defined(OS_MACOSX)
   new TextInputClientObserver(this);
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_ANDROID)
-  media_player_manager_.reset(
-      new webkit_media::WebMediaPlayerManagerAndroid());
+  media_player_manager_.reset(new WebMediaPlayerManagerAndroid());
 #endif
 
   // The next group of objects all implement RenderViewObserver, so are deleted
   // along with the RenderView automatically.
   devtools_agent_ = new DevToolsAgent(this);
   mouse_lock_dispatcher_ = new RenderViewMouseLockDispatcher(this);
 
   new ImageLoadingHelper(this);
 
   // Create renderer_accessibility_ if needed.
@@ skipping 1937 matching lines @@
   }
 
   scoped_refptr<cc::ContextProvider> context_provider =
       RenderThreadImpl::current()->OffscreenContextProviderForMainThread();
   if (!context_provider.get()) {
     LOG(ERROR) << "Failed to get context3d for media player";
     return NULL;
   }
 
   if (!media_player_proxy_) {
-    media_player_proxy_ = new WebMediaPlayerProxyImplAndroid(
+    media_player_proxy_ = new WebMediaPlayerProxyAndroid(
         this, media_player_manager_.get());
   }
-  scoped_ptr<webkit_media::WebMediaPlayerAndroid> web_media_player_android(
-      new webkit_media::WebMediaPlayerAndroid(
+  scoped_ptr<WebMediaPlayerAndroid> web_media_player_android(
+      new WebMediaPlayerAndroid(
           frame,
           client,
           AsWeakPtr(),
           media_player_manager_.get(),
           media_player_proxy_,
-          new StreamTextureFactoryImpl(
+          new StreamTextureFactory(
               context_provider->Context3d(), gpu_channel_host, routing_id_),
           new RenderMediaLog()));
 #if defined(ENABLE_WEBRTC) && defined(GOOGLE_TV)
   if (MediaStreamImpl::CheckMediaStream(url)) {
     EnsureMediaStreamImpl();
     RTCVideoDecoderFactoryTv* factory = RenderThreadImpl::current()
         ->GetMediaStreamDependencyFactory()->decoder_factory_tv();
     // |media_stream_impl_| and |factory| outlives |web_media_player_android|.
     if (!factory->AcquireDemuxer() ||
         !web_media_player_android->InjectMediaStream(
@@ skipping 3874 matching lines @@
     WebURL url = icon_urls[i].iconURL();
     if (!url.isEmpty())
       urls.push_back(FaviconURL(url,
                                 ToFaviconType(icon_urls[i].iconType())));
   }
   SendUpdateFaviconURL(urls);
 }
 
 
 }  // namespace content