Reland: Use a shared thread for media operations (round 3).

webkit/support/webkit_support.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 "webkit/support/webkit_support.h"
 
 #include "base/at_exit.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 188 matching lines @@
   // file-over-http bridge.
   void set_mock_current_directory(const base::FilePath& directory) {
     mock_current_directory_ = directory;
   }
 
   base::FilePath mock_current_directory() const {
     return mock_current_directory_;
   }
 #endif
 
+  scoped_refptr<base::MessageLoopProxy> GetMediaThreadMessageLoopProxy() {
+    if (!media_thread_) {
+      media_thread_.reset(new base::Thread("Media"));
+      CHECK(media_thread_->Start());
+    }
+    return media_thread_->message_loop_proxy();
+  }
+
  private:
   // Data member at_exit_manager_ will take the ownership of the input
   // AtExitManager and manage its lifecycle.
   scoped_ptr<base::AtExitManager> at_exit_manager_;
   scoped_ptr<MessageLoopType> main_message_loop_;
   scoped_ptr<TestWebKitPlatformSupport> webkit_platform_support_;
 
+  scoped_ptr<base::Thread> media_thread_;
+
 #if defined(OS_ANDROID)
   base::FilePath mock_current_directory_;
 #endif
 };
 
 class WebPluginImplWithPageDelegate
     : public webkit_support::TestWebPluginPageDelegate,
       public base::SupportsWeakPtr<WebPluginImplWithPageDelegate>,
       public webkit::npapi::WebPluginImpl {
  public:
@@ skipping 171 matching lines @@
         client,
         base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
         media_stream_client,
         new media::MediaLog());
   }
 
 #if defined(OS_ANDROID)
   return NULL;
 #else
   webkit_media::WebMediaPlayerParams params(
+      test_environment->GetMediaThreadMessageLoopProxy(),
       NULL, NULL, new media::MediaLog());
   return new webkit_media::WebMediaPlayerImpl(
       frame,
       client,
       base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
       params);
 #endif
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
@@ skipping 424 matching lines @@
 // Logging
 void EnableWebCoreLogChannels(const std::string& channels) {
   webkit_glue::EnableWebCoreLogChannels(channels);
 }
 
 void SetGamepadData(const WebKit::WebGamepads& pads) {
   test_environment->webkit_platform_support()->setGamepadData(pads);
 }
 
 }  // namespace webkit_support