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

content/renderer/media/android/webmediaplayer_proxy_android.h

 // 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.
 
-#ifndef WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
-#define WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#ifndef CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#define CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
 
 #include <string>
 
 #include "base/time.h"
 #include "googleurl/src/gurl.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/android/media_player_android.h"
 
-namespace webkit_media {
+namespace content {
 
 // An interface to facilitate the IPC between the browser side
 // android::MediaPlayer and the WebMediaPlayerImplAndroid in the renderer
 // process.
 // Implementation is provided by content::WebMediaPlayerProxyImplAndroid.
 class WebMediaPlayerProxyAndroid {
  public:
   virtual ~WebMediaPlayerProxyAndroid();
 
   // Initialize a MediaPlayerAndroid object in browser process
@@ skipping 50 matching lines @@
                       const std::string& session_id) = 0;
 
   virtual void CancelKeyRequest(int player_id,
                                 const std::string& session_id) = 0;
 
   // Inform the media source player of changed duration from demuxer.
   virtual void DurationChanged(int player_id,
                                const base::TimeDelta& duration) = 0;
 };
 
-}  // namespace webkit_media
+}  // namespace content
 
-#endif  // WEBKIT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_
+#endif  // CONTENT_RENDERER_MEDIA_ANDROID_WEBMEDIAPLAYER_PROXY_ANDROID_H_