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

webkit/tools/test_shell/test_webview_delegate.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.
 
 // This file contains the implementation of TestWebViewDelegate, which serves
 // as the WebViewDelegate for the TestShellWebHost.  The host is expected to
 // have initialized a MessageLoop before these methods are called.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
@@ skipping 629 matching lines @@
 }
 
 WebMediaPlayer* TestWebViewDelegate::createMediaPlayer(
     WebFrame* frame, WebMediaPlayerClient* client) {
   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(),
           NULL,
-          new media::MediaLog()));
-  if (!result->Initialize(frame, false)) {
-    return NULL;
-  }
-  return result.release();
+          new media::MediaLog());
+  media_player->Initialize(frame);
+  return media_player;
 }
 
 WebApplicationCacheHost* TestWebViewDelegate::createApplicationCacheHost(
     WebFrame* frame, WebApplicationCacheHostClient* client) {
   return SimpleAppCacheSystem::CreateApplicationCacheHost(client);
 }
 
 bool TestWebViewDelegate::allowPlugins(WebFrame* frame,
                                        bool enabled_per_settings) {
   return enabled_per_settings && shell_->allow_plugins();
@@ skipping 483 matching lines @@
 }
 
 void TestWebViewDelegate::set_fake_window_rect(const WebRect& rect) {
   fake_rect_ = rect;
   using_fake_rect_ = true;
 }
 
 WebRect TestWebViewDelegate::fake_window_rect() {
   return fake_rect_;
 }