Move WebMediaPlayerImpl and its dependencies to media/blink.

content/renderer/media/buffered_data_source_unittest.cc

Index: content/renderer/media/buffered_data_source_unittest.cc
diff --git a/content/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc
index 9749991681475abb06f59e71d807e6e79b325e9e..b81d5e3e33334bb4494c5b40b9898175a61464c3 100644
--- a/content/renderer/media/buffered_data_source_unittest.cc
+++ b/content/renderer/media/buffered_data_source_unittest.cc
@@ -5,13 +5,13 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/public/common/url_constants.h"
-#include "content/renderer/media/buffered_data_source.h"
 #include "content/renderer/media/test_response_generator.h"
 #include "content/test/mock_webframeclient.h"
 #include "content/test/mock_weburlloader.h"
 #include "media/base/media_log.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
+#include "media/blink/buffered_data_source.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
@@ -29,7 +29,11 @@ using blink::WebURLLoader;
 using blink::WebURLResponse;
 using blink::WebView;
 
-namespace content {
+using content::MockWebURLLoader;
+using content::MockWebFrameClient;
+using content::TestResponseGenerator;
+
+namespace media {

[jamesr, 2014/09/02 19:26:44]

so long as this test lives in content/... it should be in namespace content::.
if you want to move this to the media namespace put it under the media
directory. having symbols in media:: defined here is confusing.

[acolwell GONE FROM CHROMIUM, 2014/09/02 20:20:25]

I can't move it into media/ because the test relies on fakes and mocks in
content/. This test is also a friend of the BufferedDataSource so it can access
internal state. Putting this in the media namespace seemed like a better
solution then referencing the content namespace from media/ in the friend
declaration. Would a comment explaining this be acceptable or do you want me to
make all the necessary changes to avoid the friend decl?

[scherkus (not reviewing), 2014/09/02 20:29:51]

Is moving the mocks an option? AFAICT they're only used by media/ code based on
some git-grepping.

$ git grep -l
"\b(MockWebURLLoader\|MockWebFrameClient\|TestResponseGenerator\b)" -- "*.cc"   
                                                 
content/renderer/media/android/media_info_loader_unittest.cc
content/renderer/media/buffered_data_source_unittest.cc
content/renderer/media/buffered_resource_loader_unittest.cc

It seems like media_info_loader_unittest.cc is the only sticking point, but
that's because we haven't decided to tackle moving Android media code into
media/blink/ just yet. Maybe we can start with just moving MediaInfoLoader?

 
 class MockBufferedDataSourceHost : public BufferedDataSourceHost {
  public:
@@ -777,4 +781,4 @@ TEST_F(BufferedDataSourceTest,
   Stop();
 }
 
-}  // namespace content
+}  // namespace media