Update snapshot with updated patches

Mountain Lion's clang does not support incomplete types in templates
so remove some new forward declarations.
This also removes a patch with an unneded export that we used when
a separate library needed the symbol.

This diff was automatically created with take_snapshot.py.

Change-Id: Ie960fa23aee531cb5fc1677b8e77fceab7dce1b0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

3 files changed, 14 insertions, 19 deletions

diff --git a/chromium/content/public/app/content_main_runner.h b/chromium/content/public/app/content_main_runner.h
index 992e0d00d46..bed5ff2715c 100644
--- a/chromium/content/public/app/content_main_runner.h
+++ b/chromium/content/public/app/content_main_runner.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "build/build_config.h"
-#include "content/common/content_export.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ -23,7 +22,7 @@ namespace content {
 class ContentMainDelegate;
 
 // This class is responsible for content initialization, running and shutdown.
-class CONTENT_EXPORT ContentMainRunner {
+class ContentMainRunner {
  public:
   virtual ~ContentMainRunner() {}
 
diff --git a/chromium/content/renderer/pepper/message_channel.cc b/chromium/content/renderer/pepper/message_channel.cc
index f06b787e795..c41be2f451a 100644
--- a/chromium/content/renderer/pepper/message_channel.cc
+++ b/chromium/content/renderer/pepper/message_channel.cc
@@ -279,18 +279,6 @@ NPClass message_channel_class = {
 }  // namespace
 
 // MessageChannel --------------------------------------------------------------
-struct MessageChannel::VarConversionResult {
-  VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
-      : result(r),
-        success(s),
-        conversion_completed(true) {}
-  VarConversionResult()
-      : success(false),
-        conversion_completed(false) {}
-  ppapi::ScopedPPVar result;
-  bool success;
-  bool conversion_completed;
-};
 
 MessageChannel::MessageChannelNPObject::MessageChannelNPObject() {
 }
diff --git a/chromium/content/renderer/pepper/message_channel.h b/chromium/content/renderer/pepper/message_channel.h
index 9c8c28df3c4..e4e14233593 100644
--- a/chromium/content/renderer/pepper/message_channel.h
+++ b/chromium/content/renderer/pepper/message_channel.h
@@ -10,15 +10,12 @@
 
 #include "base/memory/weak_ptr.h"
 #include "ppapi/shared_impl/resource.h"
+#include "ppapi/shared_impl/scoped_pp_var.h"
 #include "third_party/WebKit/public/web/WebSerializedScriptValue.h"
 #include "third_party/npapi/bindings/npruntime.h"
 
 struct PP_Var;
 
-namespace ppapi {
-class ScopedPPVar;
-}
-
 namespace content {
 
 class PepperPluginInstanceImpl;
@@ -86,7 +83,18 @@ class MessageChannel {
 
  private:
   // Struct for storing the result of a NPVariant being converted to a PP_Var.
-  struct VarConversionResult;
+  struct VarConversionResult {
+    VarConversionResult(const ppapi::ScopedPPVar& r, bool s)
+        : result(r),
+          success(s),
+          conversion_completed(true) {}
+    VarConversionResult()
+        : success(false),
+          conversion_completed(false) {}
+    ppapi::ScopedPPVar result;
+    bool success;
+    bool conversion_completed;
+  };
 
   // This is called when an NPVariant is finished being converted.
   // |result_iteartor| is an iterator into |converted_var_queue_| where the