BASELINE: Update Chromium to 47.0.2526.14

Also adding in sources needed for spellchecking.

Change-Id: Idd44170fa1616f26315188970a8d5ba7d472b18a
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 39 insertions, 74 deletions

diff --git a/chromium/remoting/remoting_client.gypi b/chromium/remoting/remoting_client.gypi
index 3d53e39c466..891b625b222 100644
--- a/chromium/remoting/remoting_client.gypi
+++ b/chromium/remoting/remoting_client.gypi
@@ -5,31 +5,6 @@
 {
   'targets': [
     {
-      # GN version: //remoting/client/plugin
-      'target_name': 'remoting_client_plugin',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'defines': [
-        'HAVE_STDINT_H',  # Required by on2_integer.h
-      ],
-      'dependencies': [
-        '../net/net.gyp:net',
-        '../ppapi/ppapi.gyp:ppapi_cpp_objects',
-        '../ppapi/ppapi.gyp:ppapi_internal_module',
-        '../third_party/webrtc/modules/modules.gyp:desktop_capture',
-        '../ui/events/events.gyp:dom_keycode_converter',
-        'remoting_base',
-        'remoting_client',
-        'remoting_protocol',
-      ],
-      'sources': [
-        '<@(remoting_client_plugin_sources)',
-        'client/plugin/pepper_entrypoints.cc',
-        'client/plugin/pepper_entrypoints.h',
-      ],
-    },  # end of target 'remoting_client_plugin'
-
-    {
       # GN version: //remoting/client
       'target_name': 'remoting_client',
       'type': 'static_library',
@@ -121,6 +96,25 @@
             '--js', '<@(remoting_webapp_message_window_html_all_js_files)',
           ],
         },
+        {
+          'action_name': 'Build Remoting Webapp public_session.html',
+          'inputs': [
+            'webapp/build-html.py',
+            '<(remoting_webapp_template_public_session)',
+          ],
+          'outputs': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/public_session.html',
+          ],
+          'action': [
+            'python', 'webapp/build-html.py',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/public_session.html',
+            '<(remoting_webapp_template_public_session)',
+            '--template-dir', '<(DEPTH)/remoting',
+            '--templates', '<@(remoting_webapp_public_session_template_files)',
+            '--js',
+            '<@(remoting_webapp_public_session_html_all_js_files)',
+          ],
+        },
       ],  # end of actions
     },  # end of target 'remoting_webapp_html'
 
@@ -152,66 +146,37 @@
       ],
     },
     {
-      # GN version: //remoting/webapp:webapp
+      # GN version: //remoting/webapp
       'target_name': 'remoting_webapp',
       'type': 'none',
-      'dependencies': [
-        'remoting_client_credits',
-        'remoting_webapp_v1',
-      ],
-      'conditions': [
-        ['disable_nacl==0 and disable_nacl_untrusted==0', {
-          'dependencies': [
-            'remoting_webapp_v2',
-          ],
-        }]
-      ],
-    },  # end of target 'remoting_webapp'
-
-    {
-      # GN version: //remoting/webapp:webapp_v1
-      'target_name': 'remoting_webapp_v1',
-      'type': 'none',
       'variables': {
-        'webapp_type': 'v1',
-        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp',
-        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.zip',
+        'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
+        'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
+        'webapp_type': 'desktop',
+        'extra_files': [
+          'webapp/crd/remoting_client_pnacl.nmf.jinja2',
+        ],
       },
-      'includes': [ 'remoting_webapp.gypi', ],
-    },  # end of target 'remoting_webapp_v1'
-  ],  # end of targets
-
-  'conditions': [
-    ['disable_nacl==0 and disable_nacl_untrusted==0', {
-      'targets': [
-        {
-          # GN version: //remoting/webapp:webapp_v1
-          'target_name': 'remoting_webapp_v2',
-          'type': 'none',
+      'conditions': [
+        ['disable_nacl==0 and disable_nacl_untrusted==0', {
           'variables': {
-            'output_dir': '<(PRODUCT_DIR)/remoting/remoting.webapp.v2',
-            'zip_path': '<(PRODUCT_DIR)/remoting-webapp.v2.zip',
-            'webapp_type': 'v2_pnacl',
             'extra_files': [
-              'webapp/crd/remoting_client_pnacl.nmf.jinja2',
               '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe',
             ],
           },
           'dependencies': [
             'remoting_nacl.gyp:remoting_client_plugin_nacl',
           ],
-          'conditions': [
-            ['buildtype == "Dev"', {
-              'variables': {
-                'extra_files': [
-                  '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
-                ],
-              },
-            }],
-          ],
-          'includes': [ 'remoting_webapp.gypi', ],
-        },  # end of target 'remoting_webapp_v2'
+        }],
+        ['disable_nacl==0 and disable_nacl_untrusted==0 and buildtype == "Dev"', {
+          'variables': {
+            'extra_files': [
+              '<(PRODUCT_DIR)/remoting_client_plugin_newlib.pexe.debug',
+            ],
+          },
+        }],
       ],
-    }],
-  ],
+      'includes': [ 'remoting_webapp.gypi', ],
+    },  # end of target 'remoting_webapp'
+  ],  # end of targets
 }