Remove obsolete patches.

(Portage version: 2.2.0_alpha174/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

12 files changed, 12 insertions, 999 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8413a8cd6ac0..6b96dfe46869 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.877 2013/05/09 00:35:37 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.878 2013/05/09 00:42:41 floppym Exp $
+
+  09 May 2013; Mike Gilbert <floppym@gentoo.org>
+  -files/chromium-icu50-tests-r0.patch, -files/chromium-mesa-r0.patch,
+  -files/chromium-mesa-r1.patch, -files/chromium-no-pnacl-r0.patch,
+  -files/chromium-system-ffmpeg-r0.patch,
+  -files/chromium-system-ffmpeg-r1.patch,
+  -files/chromium-system-ffmpeg-r2.patch,
+  -files/chromium-system-ffmpeg-r3.patch,
+  -files/chromium-system-libpng-r0.patch,
+  -files/chromium-system-minizip-r0.patch, -files/chromium-system-opus-r0.patch:
+  Remove obsolete patches.
 
 *chromium-27.0.1453.81 (09 May 2013)
 
diff --git a/www-client/chromium/files/chromium-icu50-tests-r0.patch b/www-client/chromium/files/chromium-icu50-tests-r0.patch
deleted file mode 100644
index 8c5daba7ddac..000000000000
--- a/www-client/chromium/files/chromium-icu50-tests-r0.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-Index: base/i18n/time_formatting_unittest.cc
-diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc
-index 76ffa5d178147f99ec300b2a5d398dc40582f911..1d4bc311f3cb8dea90622a5964a613435378caa8 100644
---- a/base/i18n/time_formatting_unittest.cc
-+++ b/base/i18n/time_formatting_unittest.cc
-@@ -8,6 +8,7 @@
- #include "base/time.h"
- #include "base/utf_string_conversions.h"
- #include "testing/gtest/include/gtest/gtest.h"
-+#include "unicode/uversion.h"
- 
- namespace base {
- namespace {
-@@ -57,7 +58,12 @@ TEST(TimeFormattingTest, TimeFormatTimeOfDayDefault24h) {
- 
-   Time time(Time::FromLocalExploded(kTestDateTimeExploded));
-   string16 clock24h(ASCIIToUTF16("15:42"));
-+#if U_ICU_VERSION_MAJOR_NUM >= 50
-+  string16 clock12h_pm(ASCIIToUTF16("3:42 pm"));
-+#else
-+  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
-   string16 clock12h_pm(ASCIIToUTF16("3:42 PM"));
-+#endif
-   string16 clock12h(ASCIIToUTF16("3:42"));
- 
-   // The default is 24h clock.
-@@ -125,10 +131,25 @@ TEST(TimeFormattingTest, TimeFormatDateUS) {
- 
-   EXPECT_EQ(ASCIIToUTF16("Apr 30, 2011"), TimeFormatShortDate(time));
-   EXPECT_EQ(ASCIIToUTF16("4/30/11"), TimeFormatShortDateNumeric(time));
-+
-+#if U_ICU_VERSION_MAJOR_NUM >= 50
-+  EXPECT_EQ(ASCIIToUTF16("4/30/11, 3:42:07 PM"),
-+            TimeFormatShortDateAndTime(time));
-+#else
-+  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
-   EXPECT_EQ(ASCIIToUTF16("4/30/11 3:42:07 PM"),
-             TimeFormatShortDateAndTime(time));
-+#endif
-+
-+#if U_ICU_VERSION_MAJOR_NUM >= 50
-+  EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 at 3:42:07 PM"),
-+            TimeFormatFriendlyDateAndTime(time));
-+#else
-+  // TODO(phajdan.jr): Clean up after bundled ICU gets updated to 50.
-   EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011 3:42:07 PM"),
-             TimeFormatFriendlyDateAndTime(time));
-+#endif
-+
-   EXPECT_EQ(ASCIIToUTF16("Saturday, April 30, 2011"),
-             TimeFormatFriendlyDate(time));
- }
diff --git a/www-client/chromium/files/chromium-mesa-r0.patch b/www-client/chromium/files/chromium-mesa-r0.patch
deleted file mode 100644
index f4f8006054ce..000000000000
--- a/www-client/chromium/files/chromium-mesa-r0.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-index 80a4d230ad4b82abbaa82f2c328286b9d89da329..d56df6fdb0d851125148a1aac0bedbc487320682 100644
---- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
-+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-@@ -355,7 +355,8 @@ void GLES2ShaderBinary(
-       n, shaders, binaryformat, binary, length);
- }
- void GLES2ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) {
-   gles2::GetGLContext()->ShaderSource(shader, count, str, length);
- }
- void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {
-Index: gpu/command_buffer/client/gles2_implementation.cc
-diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
-index b6c354819ce5d556ff91f7b5273875c3cec83f7a..600c02f3751a2ab72eed498be7ee0f02e628130d 100644
---- a/gpu/command_buffer/client/gles2_implementation.cc
-+++ b/gpu/command_buffer/client/gles2_implementation.cc
-@@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
- }
- 
- void GLES2Implementation::ShaderSource(
--    GLuint shader, GLsizei count, const char** source, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
-   GPU_CLIENT_SINGLE_THREAD_CHECK();
-   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
-       << shader << ", " << count << ", "
-Index: gpu/command_buffer/client/gles2_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
-index febcaf45bb5446393c7785196c9ef4a329438d0f..e4a63822ae6b3b9c950b7f9b05f173ce1ecfdb87 100644
---- a/gpu/command_buffer/client/gles2_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
-@@ -253,7 +253,7 @@ virtual void ShaderBinary(
-     GLsizei length) OVERRIDE;
- 
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- 
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
-Index: gpu/command_buffer/client/gles2_interface_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
-index b84dd71bd9139ac487a40847ddb746f839cf3593..8aafc7fd45891be4e2aa61f5825c20d0ccd1dc76 100644
---- a/gpu/command_buffer/client/gles2_interface_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_autogen.h
-@@ -152,7 +152,8 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) = 0;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) = 0;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
- virtual void StencilFuncSeparate(
-     GLenum face, GLenum func, GLint ref, GLuint mask) = 0;
-Index: gpu/command_buffer/client/gles2_interface_stub_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-index 3c1c6696b08923142c879aa591b3902339e5874c..80e6c1003ae1be90fcd1a2871ffdde58f7237bff 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) OVERRIDE;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-index dce39c0def3ec52499c712afe1f792809c00db28..f097e8cba8e4d13af9027122a36b93f2ec28ae46 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-@@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary(
-     const void* /* binary */, GLsizei /* length */) {
- }
- void GLES2InterfaceStub::ShaderSource(
--    GLuint /* shader */, GLsizei /* count */, const char** /* str */,
-+    GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */,
-     const GLint* /* length */) {
- }
- void GLES2InterfaceStub::StencilFunc(
-Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-index 46cbdccccd0e3e4074b1fd919fc6b91d95fe04a5..da02881f9d180bd26f5a2bad2d4e814a9ca085b3 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) OVERRIDE;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-index 8aff42a6711c38b76e8767057b41fa31fe89f168..8f87a40da0f26f0dd71772e5fbcf519c8b02ad12 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-@@ -570,7 +570,8 @@ void GLES2TraceImplementation::ShaderBinary(
- }
- 
- void GLES2TraceImplementation::ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) {
-   TRACE_EVENT0("gpu", "GLES2Trace::ShaderSource");
-   gl_->ShaderSource(shader, count, str, length);
- }
-Index: gpu/command_buffer/cmd_buffer_functions.txt
-diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
-index 2ad875a4aeaf86566c5f0334090f6583468c4781..08d33d963e3450d6fe442b333fb88089b184d86b 100644
---- a/gpu/command_buffer/cmd_buffer_functions.txt
-+++ b/gpu/command_buffer/cmd_buffer_functions.txt
-@@ -103,7 +103,7 @@ GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar
- GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
--GL_APICALL void         GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
-+GL_APICALL void         GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length);
- GL_APICALL void         GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/GLES2/gl2.h
-diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
-index edebb8b23a56f6a67bb1ecfe5304bb5b372745e6..7aef573b6af7f4e3c76bdfb741374521b2f1eca4 100644
---- a/third_party/khronos/GLES2/gl2.h
-+++ b/third_party/khronos/GLES2/gl2.h
-@@ -160,7 +160,6 @@ typedef khronos_ssize_t  GLsizeiptr;
- #define GL_INVALID_VALUE                  0x0501
- #define GL_INVALID_OPERATION              0x0502
- #define GL_OUT_OF_MEMORY                  0x0505
--#define GL_CONTEXT_LOST                   0x300E  // TODO(gman): What value?
- 
- /* FrontFaceDirection */
- #define GL_CW                             0x0900
-@@ -529,7 +528,7 @@ GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
- GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
--GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint        GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
- GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL GLenum       GL_APIENTRY glGetError (void);
-@@ -548,7 +547,7 @@ GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
- GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
- GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
--GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint        GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-@@ -570,7 +569,7 @@ GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
- GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
--GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
-+GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
- GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/README.chromium
-diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
-index b47cb038c3cc5b51181194a55869842118bf7a56..da2e6c511e33767a458da1a17bd1b78e87779439 100644
---- a/third_party/khronos/README.chromium
-+++ b/third_party/khronos/README.chromium
-@@ -20,7 +20,6 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
- and not here.
- 
- GLES2/gl2.h
-- - Added GL_CONTEXT_LOST constant.
-  - Added include of gl2chromium.h
- GLES2/gl2ext.h
-  - Added Chromium and Angle extensions.
-Index: ui/gl/generate_bindings.py
-diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
-index 16f89984bc3d1dc967d6ea3d2c4c1ed799716f8e..8422bbc8baf049f6431cea602a179296698f12b3 100755
---- a/ui/gl/generate_bindings.py
-+++ b/ui/gl/generate_bindings.py
-@@ -482,7 +482,7 @@ GL_FUNCTIONS = [
- { 'return_type': 'void',
-   'names': ['glShaderSource'],
-   'arguments':
--      'GLuint shader, GLsizei count, const char** str, const GLint* length',
-+      'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
-   'logging_code': """
-   GL_SERVICE_LOG_CODE_BLOCK({
-     for (GLsizei ii = 0; ii < count; ++ii) {
-@@ -1584,7 +1584,7 @@ namespace gfx {
-     file.write('\n')
-     file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
-         (func['return_type'], func['names'][0], func['arguments']))
--    argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
-+    argument_names = re.sub(r'(const )?[a-zA-Z0-9]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
-                               func['arguments'])
-     if argument_names == 'void':
-       argument_names = ''
-Index: ui/gl/gl_bindings_skia_in_process.cc
-diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
-index f45626616ed6ff8e8de0c59b25165e6b51f3668d..115eac8d8a57e7abc000935e20c8eb311cd404e8 100644
---- a/ui/gl/gl_bindings_skia_in_process.cc
-+++ b/ui/gl/gl_bindings_skia_in_process.cc
-@@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
-   glScissor(x, y, width, height);
- }
- 
--GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
-+GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
-                           const GLint* length) {
-   glShaderSource(shader, count, str, length);
- }
-Index: third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
-===================================================================
---- a/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h	(revision 7840)
-+++ b/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h	(working copy)
-@@ -37,4 +37,8 @@
- // Non-VBO vertices and indices are not allowed in Chromium.
- #define GR_GL_MUST_USE_VBO                          1
- 
-+// Use updated Khronos signature for glShaderSource
-+// (const char* const instead of char**).
-+#define GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE       1
-+
- #endif
diff --git a/www-client/chromium/files/chromium-mesa-r1.patch b/www-client/chromium/files/chromium-mesa-r1.patch
deleted file mode 100644
index c09a43e412e4..000000000000
--- a/www-client/chromium/files/chromium-mesa-r1.patch
+++ /dev/null
@@ -1,232 +0,0 @@
-Index: gpu/command_buffer/client/gles2_c_lib_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_c_lib_autogen.h b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-index 80a4d230ad4b82abbaa82f2c328286b9d89da329..d56df6fdb0d851125148a1aac0bedbc487320682 100644
---- a/gpu/command_buffer/client/gles2_c_lib_autogen.h
-+++ b/gpu/command_buffer/client/gles2_c_lib_autogen.h
-@@ -355,7 +355,8 @@ void GLES2ShaderBinary(
-       n, shaders, binaryformat, binary, length);
- }
- void GLES2ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) {
-   gles2::GetGLContext()->ShaderSource(shader, count, str, length);
- }
- void GLES2StencilFunc(GLenum func, GLint ref, GLuint mask) {
-Index: gpu/command_buffer/client/gles2_implementation.cc
-diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
-index b6c354819ce5d556ff91f7b5273875c3cec83f7a..600c02f3751a2ab72eed498be7ee0f02e628130d 100644
---- a/gpu/command_buffer/client/gles2_implementation.cc
-+++ b/gpu/command_buffer/client/gles2_implementation.cc
-@@ -1173,7 +1173,7 @@ void GLES2Implementation::VertexAttribDivisorANGLE(
- }
- 
- void GLES2Implementation::ShaderSource(
--    GLuint shader, GLsizei count, const char** source, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* source, const GLint* length) {
-   GPU_CLIENT_SINGLE_THREAD_CHECK();
-   GPU_CLIENT_LOG("[" << GetLogPrefix() << "] glShaderSource("
-       << shader << ", " << count << ", "
-Index: gpu/command_buffer/client/gles2_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_implementation_autogen.h b/gpu/command_buffer/client/gles2_implementation_autogen.h
-index febcaf45bb5446393c7785196c9ef4a329438d0f..e4a63822ae6b3b9c950b7f9b05f173ce1ecfdb87 100644
---- a/gpu/command_buffer/client/gles2_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_implementation_autogen.h
-@@ -253,7 +253,7 @@ virtual void ShaderBinary(
-     GLsizei length) OVERRIDE;
- 
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- 
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
-Index: gpu/command_buffer/client/gles2_interface_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_autogen.h b/gpu/command_buffer/client/gles2_interface_autogen.h
-index b84dd71bd9139ac487a40847ddb746f839cf3593..8aafc7fd45891be4e2aa61f5825c20d0ccd1dc76 100644
---- a/gpu/command_buffer/client/gles2_interface_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_autogen.h
-@@ -152,7 +152,8 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) = 0;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) = 0;
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) = 0;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) = 0;
- virtual void StencilFuncSeparate(
-     GLenum face, GLenum func, GLint ref, GLuint mask) = 0;
-Index: gpu/command_buffer/client/gles2_interface_stub_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-index 3c1c6696b08923142c879aa591b3902339e5874c..80e6c1003ae1be90fcd1a2871ffdde58f7237bff 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) OVERRIDE;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-index dce39c0def3ec52499c712afe1f792809c00db28..f097e8cba8e4d13af9027122a36b93f2ec28ae46 100644
---- a/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h
-@@ -310,7 +310,7 @@ void GLES2InterfaceStub::ShaderBinary(
-     const void* /* binary */, GLsizei /* length */) {
- }
- void GLES2InterfaceStub::ShaderSource(
--    GLuint /* shader */, GLsizei /* count */, const char** /* str */,
-+    GLuint /* shader */, GLsizei /* count */, const GLchar* const* /* str */,
-     const GLint* /* length */) {
- }
- void GLES2InterfaceStub::StencilFunc(
-Index: gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-index 46cbdccccd0e3e4074b1fd919fc6b91d95fe04a5..da02881f9d180bd26f5a2bad2d4e814a9ca085b3 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_autogen.h
-@@ -163,7 +163,7 @@ virtual void ShaderBinary(
-     GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary,
-     GLsizei length) OVERRIDE;
- virtual void ShaderSource(
--    GLuint shader, GLsizei count, const char** str,
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-     const GLint* length) OVERRIDE;
- virtual void StencilFunc(GLenum func, GLint ref, GLuint mask) OVERRIDE;
- virtual void StencilFuncSeparate(
-Index: gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-diff --git a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-index 8aff42a6711c38b76e8767057b41fa31fe89f168..8f87a40da0f26f0dd71772e5fbcf519c8b02ad12 100644
---- a/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-+++ b/gpu/command_buffer/client/gles2_trace_implementation_impl_autogen.h
-@@ -570,7 +570,8 @@ void GLES2TraceImplementation::ShaderBinary(
- }
- 
- void GLES2TraceImplementation::ShaderSource(
--    GLuint shader, GLsizei count, const char** str, const GLint* length) {
-+    GLuint shader, GLsizei count, const GLchar* const* str,
-+    const GLint* length) {
-   TRACE_EVENT_BINARY_EFFICIENT0("gpu", "GLES2Trace::ShaderSource");
-   gl_->ShaderSource(shader, count, str, length);
- }
-Index: gpu/command_buffer/cmd_buffer_functions.txt
-diff --git a/gpu/command_buffer/cmd_buffer_functions.txt b/gpu/command_buffer/cmd_buffer_functions.txt
-index 2ad875a4aeaf86566c5f0334090f6583468c4781..08d33d963e3450d6fe442b333fb88089b184d86b 100644
---- a/gpu/command_buffer/cmd_buffer_functions.txt
-+++ b/gpu/command_buffer/cmd_buffer_functions.txt
-@@ -103,7 +103,7 @@ GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenumRenderBufferTar
- GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizeiNotNegative n, const GLuint* shaders, GLenumShaderBinaryFormat binaryformat, const void* binary, GLsizeiNotNegative length);
--GL_APICALL void         GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const char** str, const GLint* length);
-+GL_APICALL void         GL_APIENTRY glShaderSource (GLidShader shader, GLsizeiNotNegative count, const GLchar* const* str, const GLint* length);
- GL_APICALL void         GL_APIENTRY glStencilFunc (GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenumFaceType face, GLenumCmpFunction func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/GLES2/gl2.h
-diff --git a/third_party/khronos/GLES2/gl2.h b/third_party/khronos/GLES2/gl2.h
-index edebb8b23a56f6a67bb1ecfe5304bb5b372745e6..7aef573b6af7f4e3c76bdfb741374521b2f1eca4 100644
---- a/third_party/khronos/GLES2/gl2.h
-+++ b/third_party/khronos/GLES2/gl2.h
-@@ -160,7 +160,6 @@ typedef khronos_ssize_t  GLsizeiptr;
- #define GL_INVALID_VALUE                  0x0501
- #define GL_INVALID_OPERATION              0x0502
- #define GL_OUT_OF_MEMORY                  0x0505
--#define GL_CONTEXT_LOST                   0x300E  // TODO(gman): What value?
- 
- /* FrontFaceDirection */
- #define GL_CW                             0x0900
-@@ -529,7 +528,7 @@ GL_APICALL void         GL_APIENTRY glGenTextures (GLsizei n, GLuint* textures);
- GL_APICALL void         GL_APIENTRY glGetActiveAttrib (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetActiveUniform (GLuint program, GLuint index, GLsizei bufsize, GLsizei* length, GLint* size, GLenum* type, GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetAttachedShaders (GLuint program, GLsizei maxcount, GLsizei* count, GLuint* shaders);
--GL_APICALL int          GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint        GL_APIENTRY glGetAttribLocation (GLuint program, const GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetBooleanv (GLenum pname, GLboolean* params);
- GL_APICALL void         GL_APIENTRY glGetBufferParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL GLenum       GL_APIENTRY glGetError (void);
-@@ -548,7 +547,7 @@ GL_APICALL void         GL_APIENTRY glGetTexParameterfv (GLenum target, GLenum p
- GL_APICALL void         GL_APIENTRY glGetTexParameteriv (GLenum target, GLenum pname, GLint* params);
- GL_APICALL void         GL_APIENTRY glGetUniformfv (GLuint program, GLint location, GLfloat* params);
- GL_APICALL void         GL_APIENTRY glGetUniformiv (GLuint program, GLint location, GLint* params);
--GL_APICALL int          GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
-+GL_APICALL GLint        GL_APIENTRY glGetUniformLocation (GLuint program, const GLchar* name);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribfv (GLuint index, GLenum pname, GLfloat* params);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribiv (GLuint index, GLenum pname, GLint* params);
- GL_APICALL void         GL_APIENTRY glGetVertexAttribPointerv (GLuint index, GLenum pname, GLvoid** pointer);
-@@ -570,7 +569,7 @@ GL_APICALL void         GL_APIENTRY glRenderbufferStorage (GLenum target, GLenum
- GL_APICALL void         GL_APIENTRY glSampleCoverage (GLclampf value, GLboolean invert);
- GL_APICALL void         GL_APIENTRY glScissor (GLint x, GLint y, GLsizei width, GLsizei height);
- GL_APICALL void         GL_APIENTRY glShaderBinary (GLsizei n, const GLuint* shaders, GLenum binaryformat, const GLvoid* binary, GLsizei length);
--GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar** string, const GLint* length);
-+GL_APICALL void         GL_APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const* string, const GLint* length);
- GL_APICALL void         GL_APIENTRY glStencilFunc (GLenum func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilFuncSeparate (GLenum face, GLenum func, GLint ref, GLuint mask);
- GL_APICALL void         GL_APIENTRY glStencilMask (GLuint mask);
-Index: third_party/khronos/README.chromium
-diff --git a/third_party/khronos/README.chromium b/third_party/khronos/README.chromium
-index b47cb038c3cc5b51181194a55869842118bf7a56..da2e6c511e33767a458da1a17bd1b78e87779439 100644
---- a/third_party/khronos/README.chromium
-+++ b/third_party/khronos/README.chromium
-@@ -20,7 +20,6 @@ NOTE: Please add Chromium-specific declarations to files in gpu/{GL,EGL,GLES2}
- and not here.
- 
- GLES2/gl2.h
-- - Added GL_CONTEXT_LOST constant.
-  - Added include of gl2chromium.h
- GLES2/gl2ext.h
-  - Added Chromium and Angle extensions.
-Index: ui/gl/generate_bindings.py
-diff --git a/ui/gl/generate_bindings.py b/ui/gl/generate_bindings.py
-index 16f89984bc3d1dc967d6ea3d2c4c1ed799716f8e..8422bbc8baf049f6431cea602a179296698f12b3 100755
---- a/ui/gl/generate_bindings.py
-+++ b/ui/gl/generate_bindings.py
-@@ -482,7 +482,7 @@ GL_FUNCTIONS = [
- { 'return_type': 'void',
-   'names': ['glShaderSource'],
-   'arguments':
--      'GLuint shader, GLsizei count, const char** str, const GLint* length',
-+      'GLuint shader, GLsizei count, const char* const* str, const GLint* length',
-   'logging_code': """
-   GL_SERVICE_LOG_CODE_BLOCK({
-     for (GLsizei ii = 0; ii < count; ++ii) {
-@@ -1584,7 +1584,7 @@ namespace gfx {
-     file.write('\n')
-     file.write('%s GL_BINDING_CALL Mock_%s(%s) {\n' %
-         (func['return_type'], func['names'][0], func['arguments']))
--    argument_names = re.sub(r'(const )?[a-zA-Z0-9]+\** ([a-zA-Z0-9]+)', r'\2',
-+    argument_names = re.sub(r'(const )?[a-zA-Z0-9]+((\s*const\s*)?\*)* ([a-zA-Z0-9]+)', r'\4',
-                               func['arguments'])
-     if argument_names == 'void':
-       argument_names = ''
-Index: ui/gl/gl_bindings_skia_in_process.cc
-diff --git a/ui/gl/gl_bindings_skia_in_process.cc b/ui/gl/gl_bindings_skia_in_process.cc
-index f45626616ed6ff8e8de0c59b25165e6b51f3668d..115eac8d8a57e7abc000935e20c8eb311cd404e8 100644
---- a/ui/gl/gl_bindings_skia_in_process.cc
-+++ b/ui/gl/gl_bindings_skia_in_process.cc
-@@ -365,7 +365,7 @@ GLvoid StubGLScissor(GLint x, GLint y, GLsizei width, GLsizei height) {
-   glScissor(x, y, width, height);
- }
- 
--GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char** str,
-+GLvoid StubGLShaderSource(GLuint shader, GLsizei count, const char* const* str,
-                           const GLint* length) {
-   glShaderSource(shader, count, str, length);
- }
-Index: third_party/skia/include/gpu/gl/GrGLConfig_chrome.h
-===================================================================
---- a/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h	(revision 7840)
-+++ b/third_party/skia/include/gpu/gl/GrGLConfig_chrome.h	(working copy)
-@@ -37,4 +37,8 @@
- // Non-VBO vertices and indices are not allowed in Chromium.
- #define GR_GL_MUST_USE_VBO                          1
- 
-+// Use updated Khronos signature for glShaderSource
-+// (const char* const instead of char**).
-+#define GR_USE_NEW_GL_SHADER_SOURCE_SIGNATURE       1
-+
- #endif
diff --git a/www-client/chromium/files/chromium-no-pnacl-r0.patch b/www-client/chromium/files/chromium-no-pnacl-r0.patch
deleted file mode 100644
index d90fbb226a6d..000000000000
--- a/www-client/chromium/files/chromium-no-pnacl-r0.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- native_client/build/untrusted.gypi	(revision 10450)
-+++ native_client/build/untrusted.gypi	(working copy)
-@@ -771,7 +771,7 @@
-       ],
-     },
-     'target_conditions': [
--      ['nexe_target!="" and build_pnacl_newlib!=0', {
-+      ['nexe_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
-         'variables': {
-             'out_pnacl_newlib_x86_32_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x32.nexe',
-             'out_pnacl_newlib_x86_64_nexe%': '<(PRODUCT_DIR)/>(nexe_target)_pnacl_newlib_x64.nexe',
-@@ -889,7 +889,7 @@
-             }],
-           ],
-       }],
--      ['nlib_target!="" and build_pnacl_newlib!=0', {
-+      ['nlib_target!="" and disable_pnacl==0 and build_pnacl_newlib!=0', {
-         'variables': {
-           'tool_name': 'pnacl_newlib',
-           'inst_dir': '<(SHARED_INTERMEDIATE_DIR)/tc_pnacl_newlib',
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch b/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
deleted file mode 100644
index 04cb6f53cacd..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r0.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- a/media/filters/ffmpeg_glue.h
-+++ b/media/filters/ffmpeg_glue.h
-@@ -28,9 +28,9 @@
- #include "base/basictypes.h"
- #include "base/memory/scoped_ptr.h"
- #include "media/base/media_export.h"
-+#include "media/ffmpeg/ffmpeg_common.h"
- 
- struct AVFormatContext;
--struct AVIOContext;
- 
- namespace media {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
-           'dependencies': [
-             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-           ],
-+          'export_dependent_settings': [
-+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+          ],
-         }, {  # use_ffmpeg == 0
-           # Exclude the sources that depend on ffmpeg.
-           'sources!': [
-diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
-index 81b770c..7b6d673 100644
---- a/webkit/media/webkit_media.gypi
-+++ b/webkit/media/webkit_media.gypi
-@@ -24,6 +24,7 @@
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base',
-         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-+        '<(DEPTH)/media/media.gyp:media',
-         '<(DEPTH)/media/media.gyp:shared_memory_support',
-         '<(DEPTH)/media/media.gyp:yuv_convert',
-         '<(DEPTH)/skia/skia.gyp:skia',
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch b/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
deleted file mode 100644
index 63a6eb682f85..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r1.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- a/media/filters/ffmpeg_glue.h
-+++ b/media/filters/ffmpeg_glue.h
-@@ -28,9 +28,9 @@
- #include "base/basictypes.h"
- #include "base/memory/scoped_ptr.h"
- #include "media/base/media_export.h"
-+#include "media/ffmpeg/ffmpeg_common.h"
- 
- struct AVFormatContext;
--struct AVIOContext;
- 
- namespace media {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
-           'dependencies': [
-             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-           ],
-+          'export_dependent_settings': [
-+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+          ],
-         }, {  # use_ffmpeg == 0
-           # Exclude the sources that depend on ffmpeg.
-           'sources!': [
-diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
-index 81b770c..7b6d673 100644
---- a/webkit/media/webkit_media.gypi
-+++ b/webkit/media/webkit_media.gypi
-@@ -24,6 +24,7 @@
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base',
-         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-+        '<(DEPTH)/media/media.gyp:media',
-         '<(DEPTH)/media/media.gyp:shared_memory_support',
-         '<(DEPTH)/media/media.gyp:yuv_convert',
-         '<(DEPTH)/skia/skia.gyp:skia',
---- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
-+++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
-@@ -10,6 +10,8 @@
- #include "media/base/video_frame.h"
- #include "media/base/video_util.h"
- 
-+#undef SampleFormat
-+
- namespace media {
- 
- // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
-@@ -84,8 +86,10 @@
-       return kCodecGSM_MS;
-     case CODEC_ID_PCM_MULAW:
-       return kCodecPCM_MULAW;
-+#ifdef CODEC_ID_OPUS
-     case CODEC_ID_OPUS:
-       return kCodecOpus;
-+#endif
-     default:
-       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
-   }
-@@ -129,8 +133,10 @@
-       return CODEC_ID_GSM_MS;
-     case kCodecPCM_MULAW:
-       return CODEC_ID_PCM_MULAW;
-+#ifdef CODEC_ID_OPUS
-     case kCodecOpus:
-       return CODEC_ID_OPUS;
-+#endif
-     default:
-       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
-   }
-@@ -423,8 +429,10 @@
-       return CHANNEL_LAYOUT_6_1_FRONT;
-     case AV_CH_LAYOUT_7POINT0_FRONT:
-       return CHANNEL_LAYOUT_7_0_FRONT;
-+#ifdef AV_CH_LAYOUT_7POINT1_WIDE_BACK
-     case AV_CH_LAYOUT_7POINT1_WIDE_BACK:
-       return CHANNEL_LAYOUT_7_1_WIDE_BACK;
-+#endif
-     case AV_CH_LAYOUT_OCTAGONAL:
-       return CHANNEL_LAYOUT_OCTAGONAL;
-     default:
---- a/media/filters/ffmpeg_audio_decoder.cc.orig	2013-01-17 00:18:24.998163847 +0000
-+++ b/media/filters/ffmpeg_audio_decoder.cc	2013-01-17 00:37:12.863736499 +0000
-@@ -402,6 +402,10 @@
- 
-     int decoded_audio_size = 0;
-     if (frame_decoded) {
-+#if !defined(LIBAVCODEC_VERSION_MAJOR) || !defined(LIBAVCODEC_VERSION_MINOR)
-+#error missing version info
-+#endif
-+#if LIBAVCODEC_VERSION_MAJOR >= 54 && LIBAVCODEC_VERSION_MINOR >= 13
-       int output_sample_rate = av_frame_->sample_rate;
-       if (output_sample_rate != samples_per_second_) {
-         DLOG(ERROR) << "Output sample rate (" << output_sample_rate
-@@ -412,6 +416,7 @@
-         queued_audio_.push_back(queue_entry);
-         break;
-       }
-+#endif
- 
-       decoded_audio_size = av_samples_get_buffer_size(
-           NULL, codec_context_->channels, av_frame_->nb_samples,
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch b/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
deleted file mode 100644
index e4c2cf43bc7d..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r2.patch
+++ /dev/null
@@ -1,215 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- a/media/filters/ffmpeg_glue.h
-+++ b/media/filters/ffmpeg_glue.h
-@@ -28,9 +28,9 @@
- #include "base/basictypes.h"
- #include "base/memory/scoped_ptr.h"
- #include "media/base/media_export.h"
-+#include "media/ffmpeg/ffmpeg_common.h"
- 
- struct AVFormatContext;
--struct AVIOContext;
- 
- namespace media {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
-           'dependencies': [
-             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-           ],
-+          'export_dependent_settings': [
-+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+          ],
-         }, {  # use_ffmpeg == 0
-           # Exclude the sources that depend on ffmpeg.
-           'sources!': [
-diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
-index 81b770c..7b6d673 100644
---- a/webkit/media/webkit_media.gypi
-+++ b/webkit/media/webkit_media.gypi
-@@ -24,6 +24,7 @@
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base',
-         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-+        '<(DEPTH)/media/media.gyp:media',
-         '<(DEPTH)/media/media.gyp:shared_memory_support',
-         '<(DEPTH)/media/media.gyp:yuv_convert',
-         '<(DEPTH)/skia/skia.gyp:skia',
---- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
-+++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
-@@ -10,6 +10,8 @@
- #include "media/base/video_frame.h"
- #include "media/base/video_util.h"
- 
-+#undef SampleFormat
-+
- namespace media {
- 
- // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
-Index: build/common.gypi
-diff --git a/build/common.gypi b/build/common.gypi
-index 34c6a15e0add1001e4a24712c9c809e3b698a390..521decfa19d102263086ebf4de7c8bac74c95e30 100644
---- a/build/common.gypi
-+++ b/build/common.gypi
-@@ -741,6 +741,9 @@
-     'google_default_client_secret%': '<(google_default_client_secret)',
-     'enable_managed_users%': '<(enable_managed_users)',
- 
-+    # Use system ffmpeg instead of bundled one.
-+    'use_system_ffmpeg%': 0,
-+
-     # Use system mesa instead of bundled one.
-     'use_system_mesa%': 0,
- 
-Index: media/ffmpeg/ffmpeg_common.cc
-diff --git a/media/ffmpeg/ffmpeg_common.cc b/media/ffmpeg/ffmpeg_common.cc
-index 26953efc699a0dc1ce9cd951eb47b04713974b44..bf234304aa2b26fb7e0f729a4e75257099c00358 100644
---- a/media/ffmpeg/ffmpeg_common.cc
-+++ b/media/ffmpeg/ffmpeg_common.cc
-@@ -84,8 +84,10 @@ AudioCodec CodecIDToAudioCodec(CodecID codec_id) {
-       return kCodecGSM_MS;
-     case CODEC_ID_PCM_MULAW:
-       return kCodecPCM_MULAW;
-+#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
-     case CODEC_ID_OPUS:
-       return kCodecOpus;
-+#endif
-     default:
-       DVLOG(1) << "Unknown audio CodecID: " << codec_id;
-   }
-@@ -129,8 +131,10 @@ static CodecID AudioCodecToCodecID(AudioCodec audio_codec,
-       return CODEC_ID_GSM_MS;
-     case kCodecPCM_MULAW:
-       return CODEC_ID_PCM_MULAW;
-+#ifndef CHROMIUM_OMIT_CODEC_ID_OPUS
-     case kCodecOpus:
-       return CODEC_ID_OPUS;
-+#endif
-     default:
-       DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
-   }
-@@ -147,8 +151,10 @@ VideoCodec CodecIDToVideoCodec(CodecID codec_id) {
-       return kCodecMPEG4;
-     case CODEC_ID_VP8:
-       return kCodecVP8;
-+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
-     case AV_CODEC_ID_VP9:
-       return kCodecVP9;
-+#endif
-     default:
-       DVLOG(1) << "Unknown video CodecID: " << codec_id;
-   }
-@@ -165,8 +171,10 @@ static CodecID VideoCodecToCodecID(VideoCodec video_codec) {
-       return CODEC_ID_MPEG4;
-     case kCodecVP8:
-       return CODEC_ID_VP8;
-+#ifndef CHROMIUM_OMIT_AV_CODEC_ID_VP9
-     case kCodecVP9:
-       return AV_CODEC_ID_VP9;
-+#endif
-     default:
-       DVLOG(1) << "Unknown VideoCodec: " << video_codec;
-   }
-@@ -468,8 +476,10 @@ ChannelLayout ChannelLayoutToChromeChannelLayout(int64_t layout, int channels) {
-       return CHANNEL_LAYOUT_6_1_FRONT;
-     case AV_CH_LAYOUT_7POINT0_FRONT:
-       return CHANNEL_LAYOUT_7_0_FRONT;
-+#ifdef AV_CH_LAYOUT_7POINT1_WIDE_BACK
-     case AV_CH_LAYOUT_7POINT1_WIDE_BACK:
-       return CHANNEL_LAYOUT_7_1_WIDE_BACK;
-+#endif
-     case AV_CH_LAYOUT_OCTAGONAL:
-       return CHANNEL_LAYOUT_OCTAGONAL;
-     default:
-Index: media/media.gyp
-diff --git a/media/media.gyp b/media/media.gyp
-index f514dec48e5cc78567d141f20e2cb970a8707e92..75b62bebb503e2d9488bf0fc5cec3fd0a7e1916d 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -469,6 +469,18 @@
-             'filters/vpx_video_decoder.h',
-           ],
-         }],
-+        ['use_system_ffmpeg == 1', {
-+          'defines': [
-+            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+                '--code "#include <libavcodec/avcodec.h>\n'
-+                'int test() { return CODEC_ID_OPUS; }" '
-+                '--on-failure CHROMIUM_OMIT_CODEC_ID_OPUS)',
-+            '<!(python <(DEPTH)/tools/compile_test/compile_test.py '
-+                '--code "#include <libavcodec/avcodec.h>\n'
-+                'int test() { return AV_CODEC_ID_VP9; }" '
-+                '--on-failure CHROMIUM_OMIT_AV_CODEC_ID_VP9)',
-+          ],
-+        }],
-         ['OS == "ios"', {
-           'includes': [
-             # For shared_memory_support_sources variable.
-Index: tools/compile_test/compile_test.py
-diff --git a/tools/compile_test/compile_test.py b/tools/compile_test/compile_test.py
-new file mode 100755
-index 0000000000000000000000000000000000000000..a52c0720209142af858d656a071ca43328dd3b16
---- /dev/null
-+++ b/tools/compile_test/compile_test.py
-@@ -0,0 +1,57 @@
-+#!/usr/bin/env python
-+# Copyright (c) 2013 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.
-+
-+"""
-+Tries to compile given code, produces different output depending on success.
-+
-+This is similar to checks done by ./configure scripts.
-+"""
-+
-+
-+import optparse
-+import os
-+import shutil
-+import subprocess
-+import sys
-+import tempfile
-+
-+
-+def DoMain(argv):
-+  parser = optparse.OptionParser()
-+  parser.add_option('--code')
-+  parser.add_option('--on-success', default='')
-+  parser.add_option('--on-failure', default='')
-+
-+  options, args = parser.parse_args(argv)
-+
-+  if not options.code:
-+    parser.error('Missing required --code switch.')
-+
-+  cxx = os.environ.get('CXX', 'g++')
-+
-+  tmpdir = tempfile.mkdtemp()
-+  try:
-+    cxx_path = os.path.join(tmpdir, 'test.cc')
-+    with open(cxx_path, 'w') as f:
-+      f.write(options.code.decode('string-escape'))
-+
-+    o_path = os.path.join(tmpdir, 'test.o')
-+
-+    cxx_popen = subprocess.Popen([cxx, cxx_path, '-o', o_path, '-c'],
-+                                 stdout=subprocess.PIPE,
-+                                 stderr=subprocess.PIPE)
-+    cxx_stdout, cxx_stderr = cxx_popen.communicate()
-+    if cxx_popen.returncode == 0:
-+      print options.on_success
-+    else:
-+      print options.on_failure
-+  finally:
-+    shutil.rmtree(tmpdir)
-+
-+  return 0
-+
-+
-+if __name__ == '__main__':
-+  sys.exit(DoMain(sys.argv[1:]))
diff --git a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch b/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
deleted file mode 100644
index d8917af0df22..000000000000
--- a/www-client/chromium/files/chromium-system-ffmpeg-r3.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/media/filters/ffmpeg_glue.h b/media/filters/ffmpeg_glue.h
-index 17241b9..8a92312 100644
---- a/media/filters/ffmpeg_glue.h
-+++ b/media/filters/ffmpeg_glue.h
-@@ -28,9 +28,9 @@
- #include "base/basictypes.h"
- #include "base/memory/scoped_ptr.h"
- #include "media/base/media_export.h"
-+#include "media/ffmpeg/ffmpeg_common.h"
- 
- struct AVFormatContext;
--struct AVIOContext;
- 
- namespace media {
- 
-diff --git a/media/media.gyp b/media/media.gyp
-index df217d2..fde3830 100644
---- a/media/media.gyp
-+++ b/media/media.gyp
-@@ -363,6 +363,9 @@
-           'dependencies': [
-             '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-           ],
-+          'export_dependent_settings': [
-+            '../third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
-+          ],
-         }, {  # use_ffmpeg == 0
-           # Exclude the sources that depend on ffmpeg.
-           'sources!': [
-diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
-index 81b770c..7b6d673 100644
---- a/webkit/media/webkit_media.gypi
-+++ b/webkit/media/webkit_media.gypi
-@@ -24,6 +24,7 @@
-       'dependencies': [
-         '<(DEPTH)/base/base.gyp:base',
-         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-+        '<(DEPTH)/media/media.gyp:media',
-         '<(DEPTH)/media/media.gyp:shared_memory_support',
-         '<(DEPTH)/media/media.gyp:yuv_convert',
-         '<(DEPTH)/skia/skia.gyp:skia',
---- a/media/ffmpeg/ffmpeg_common.cc.orig	2013-01-17 00:07:51.635057013 +0000
-+++ b/media/ffmpeg/ffmpeg_common.cc	2013-01-17 00:15:50.867406811 +0000
-@@ -10,6 +10,8 @@
- #include "media/base/video_frame.h"
- #include "media/base/video_util.h"
- 
-+#undef SampleFormat
-+
- namespace media {
- 
- // Why FF_INPUT_BUFFER_PADDING_SIZE? FFmpeg assumes all input buffers are
diff --git a/www-client/chromium/files/chromium-system-libpng-r0.patch b/www-client/chromium/files/chromium-system-libpng-r0.patch
deleted file mode 100644
index e972cdecabe4..000000000000
--- a/www-client/chromium/files/chromium-system-libpng-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/shim_headers.gypi.orig	2012-12-20 02:51:12.000000000 +0100
-+++ build/shim_headers.gypi	2012-12-20 02:51:40.000000000 +0100
-@@ -10,7 +10,7 @@
- 
- {
-   'variables': {
--    'shim_headers_path': '<(INTERMEDIATE_DIR)/shim_headers',
-+    'shim_headers_path': '<(SHARED_INTERMEDIATE_DIR)/shim_headers/<(_target_name)',
-   },
-   'direct_dependent_settings': {
-     'include_dirs+': [
diff --git a/www-client/chromium/files/chromium-system-minizip-r0.patch b/www-client/chromium/files/chromium-system-minizip-r0.patch
deleted file mode 100644
index 751b44616529..000000000000
--- a/www-client/chromium/files/chromium-system-minizip-r0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/zlib/zlib.gyp.orig	2013-04-16 16:23:59.280815868 +0000
-+++ third_party/zlib/zlib.gyp	2013-04-16 16:24:15.890910979 +0000
-@@ -127,7 +127,7 @@
-             }],
-           ],
-         }, {
--          'direct_dependent_settings': {
-+          'all_dependent_settings': {
-             'defines': [
-               'USE_SYSTEM_MINIZIP',
-             ],
diff --git a/www-client/chromium/files/chromium-system-opus-r0.patch b/www-client/chromium/files/chromium-system-opus-r0.patch
deleted file mode 100644
index 39b861e153dd..000000000000
--- a/www-client/chromium/files/chromium-system-opus-r0.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc~	2012-12-20 10:01:10.000000000 +0200
-+++ chromium-browser-25.0.1364.5/src/media/filters/opus_audio_decoder.cc	2013-01-06 13:47:49.557009450 +0200
-@@ -15,8 +15,7 @@
- #include "media/base/decoder_buffer.h"
- #include "media/base/demuxer.h"
- #include "media/base/pipeline.h"
--#include "third_party/opus/src/include/opus.h"
--#include "third_party/opus/src/include/opus_multistream.h"
-+#include "third_party/opus/opus.h"
- 
- namespace media {
- 
---- chromium-browser-25.0.1364.5/src/third_party/opus/opus.h	2013-01-06 14:34:57.267997054 +0200
-+++ chromium-browser-25.0.1364.5/src/third_party/opus/opus.h	2013-01-06 17:26:46.252153771 +0200
-@@ -7,6 +7,11 @@
- 
-+#if !defined(THIRD_PARTY_OPUS_H)
-+#define THIRD_PARTY_OPUS_H
- #if defined(USE_SYSTEM_OPUS)
- #include <opus/opus.h>
-+#include <opus/opus_multistream.h>
- #else
- #include "third_party/opus/src/include/opus.h"
-+#include "third_party/opus/src/include/opus_multistream.h"
-+#endif
- #endif