Remove --simple-data-source and convert WebMediaPlayerImpl::Initialize() to a void function.

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 298 matching lines @@
 #if defined(OS_ANDROID)
   // TODO: Implement the WebMediaPlayer that will be used for Android.
   return NULL;
 #else
   scoped_ptr<media::MessageLoopFactory> message_loop_factory(
       new media::MessageLoopFactoryImpl());
 
   scoped_ptr<media::FilterCollection> collection(
       new media::FilterCollection());
 
-  scoped_ptr<webkit_media::WebMediaPlayerImpl> result(
+  webkit_media::WebMediaPlayerImpl* media_player =
       new webkit_media::WebMediaPlayerImpl(
           client,
           base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
           collection.release(),
           NULL,
           message_loop_factory.release(),
           media_stream_client,
-          new media::MediaLog()));
-  if (!result->Initialize(frame, false)) {
-    return NULL;
-  }
-  return result.release();
+          new media::MediaLog());
+  media_player->Initialize(frame);
+  return media_player;
 #endif
 }
 
 WebKit::WebMediaPlayer* CreateMediaPlayer(
     WebFrame* frame,
     WebMediaPlayerClient* client) {
   return CreateMediaPlayer(frame, client, NULL);
 }
 
 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost(
@@ skipping 309 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