Move WebMediaPlayerImpl and its dependencies to media/blink.

content/renderer/media/buffered_data_source_unittest.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 "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"
 
 using ::testing::_;
 using ::testing::Assign;
 using ::testing::Invoke;
 using ::testing::InSequence;
 using ::testing::NiceMock;
 using ::testing::StrictMock;
 
 using blink::WebLocalFrame;
 using blink::WebString;
 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:
   MockBufferedDataSourceHost() {}
   virtual ~MockBufferedDataSourceHost() {}
 
   MOCK_METHOD1(SetTotalBytes, void(int64 total_bytes));
   MOCK_METHOD2(AddBufferedByteRange, void(int64 start, int64 end));
 
  private:
@@ skipping 727 matching lines @@
 
   data_source_->MediaIsPlaying();
   EXPECT_EQ(BufferedResourceLoader::kCapacityDefer, defer_strategy());
   set_might_be_reused_from_cache_in_future(false);
   data_source_->MediaIsPaused();
   EXPECT_EQ(BufferedResourceLoader::kCapacityDefer, defer_strategy());
 
   Stop();
 }
 
-}  // namespace content
+}  // namespace media