| Index: webkit/support/webkit_support.cc
|
| ===================================================================
|
| --- webkit/support/webkit_support.cc (revision 114943)
|
| +++ webkit/support/webkit_support.cc (working copy)
|
| @@ -58,6 +58,7 @@
|
| #include "webkit/plugins/webplugininfo.h"
|
| #include "webkit/support/platform_support.h"
|
| #include "webkit/support/simple_database_system.h"
|
| +#include "webkit/support/test_media_stream_client.h"
|
| #include "webkit/support/test_webkit_platform_support.h"
|
| #include "webkit/support/test_webplugin_page_delegate.h"
|
| #include "webkit/tools/test_shell/simple_file_system.h"
|
| @@ -302,8 +303,10 @@
|
| frame, new_params, plugins.front().path);
|
| }
|
|
|
| -WebKit::WebMediaPlayer* CreateMediaPlayer(WebFrame* frame,
|
| - WebMediaPlayerClient* client) {
|
| +WebKit::WebMediaPlayer* CreateMediaPlayer(
|
| + WebFrame* frame,
|
| + WebMediaPlayerClient* client,
|
| + TestMediaStreamClient* test_media_stream_client) {
|
| scoped_ptr<media::MessageLoopFactory> message_loop_factory(
|
| new media::MessageLoopFactoryImpl());
|
|
|
| @@ -316,7 +319,7 @@
|
| base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(),
|
| collection.release(),
|
| message_loop_factory.release(),
|
| - NULL,
|
| + test_media_stream_client,
|
| new media::MediaLog()));
|
| if (!result->Initialize(frame, false)) {
|
| return NULL;
|
| @@ -337,7 +340,7 @@
|
| }
|
|
|
| void SetUpGLBindings(GLBindingPreferences bindingPref) {
|
| - switch(bindingPref) {
|
| + switch (bindingPref) {
|
| case GL_BINDING_DEFAULT:
|
| gfx::GLSurface::InitializeOneOff();
|
| break;
|
| @@ -507,16 +510,16 @@
|
| // by webkit layout tests.
|
| class ScopedTempDirectoryInternal : public ScopedTempDirectory {
|
| public:
|
| - virtual bool CreateUniqueTempDir() {
|
| - return tempDirectory_.CreateUniqueTempDir();
|
| - }
|
| + virtual bool CreateUniqueTempDir() {
|
| + return tempDirectory_.CreateUniqueTempDir();
|
| + }
|
|
|
| - virtual std::string path() const {
|
| - return tempDirectory_.path().MaybeAsASCII();
|
| - }
|
| + virtual std::string path() const {
|
| + return tempDirectory_.path().MaybeAsASCII();
|
| + }
|
|
|
| private:
|
| - ScopedTempDir tempDirectory_;
|
| + ScopedTempDir tempDirectory_;
|
| };
|
|
|
| ScopedTempDirectory* CreateScopedTempDirectory() {
|
| @@ -554,8 +557,9 @@
|
| code = -1004; // NSURLErrorCannotConnectToHost
|
| break;
|
| }
|
| - } else
|
| + } else {
|
| DLOG(WARNING) << "Unknown error domain";
|
| + }
|
|
|
| return base::StringPrintf("<NSError domain %s, code %d, failing URL \"%s\">",
|
| domain.c_str(), code, error.unreachableURL.spec().data());
|
|
|