diff options
| -rw-r--r-- | chrome/test/ui/ppapi_uitest.cc | 8 | ||||
| -rw-r--r-- | webkit/glue/plugins/pepper_url_loader.cc | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/chrome/test/ui/ppapi_uitest.cc b/chrome/test/ui/ppapi_uitest.cc index 002fd79..ce37d97 100644 --- a/chrome/test/ui/ppapi_uitest.cc +++ b/chrome/test/ui/ppapi_uitest.cc @@ -114,15 +114,7 @@ TEST_F(PPAPITest, Buffer) { RunTest("Buffer"); } -#if defined(OS_MACOSX) -// http://crbug.com/48734 -TEST_F(PPAPITest, FAILS_URLLoader) { -#elif defined(OS_POSIX) -// http://crbug.com/48944 -TEST_F(PPAPITest, DISABLED_URLLoader) { -#else TEST_F(PPAPITest, URLLoader) { -#endif RunTestViaHTTP("URLLoader"); } diff --git a/webkit/glue/plugins/pepper_url_loader.cc b/webkit/glue/plugins/pepper_url_loader.cc index aee2a86..0cf03a0 100644 --- a/webkit/glue/plugins/pepper_url_loader.cc +++ b/webkit/glue/plugins/pepper_url_loader.cc @@ -151,7 +151,9 @@ URLLoader::URLLoader(PluginInstance* instance) bytes_sent_(0), total_bytes_to_be_sent_(0), bytes_received_(0), - total_bytes_to_be_received_(0) { + total_bytes_to_be_received_(0), + user_buffer_(NULL), + user_buffer_size_(0) { } URLLoader::~URLLoader() { |