Update from https://crrev.com/312398

testing/chromoting/chromoting_integration_tests.isolate

 # Copyright (c) 2014 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.
 {
   'conditions': [
     ['OS=="linux"', {
       'variables': {
         'command': [
           './browser_tests_launcher.py',
           '--commands_file',
           './browser_test_commands_linux.txt',
           '--prod_dir',
           '<(PRODUCT_DIR)',
           '--cfg_file',
           '../../remoting/tools/internal/test-account-host-config.json',
-          '--manifest_file',
+          '--me2me_manifest_file',
           '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
+          '--it2me_manifest_file',
+          '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
           '--user_profile_dir',
           '/tmp/chromoting_test_profile',
         ],
         'files': [
           '../xvfb.py',
           './browser_tests_launcher.py',
           './browser_test_commands_linux.txt',
           '<(PRODUCT_DIR)/libffmpegsumo.so',
           '<(PRODUCT_DIR)/libosmesa.so',
           '<(PRODUCT_DIR)/nacl_irt_x86_64.nexe',
           '../../remoting/tools/internal/test-account-host-config.json',
           '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json',
+          '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_assistance.json',
         ],
       },
     }],
     ['OS=="linux" and use_ozone==0', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/xdisplaycheck<(EXECUTABLE_SUFFIX)',
         ],
       },
     }],
      ['OS=="linux" or OS=="mac" or OS=="win"', {
       'variables': {
         'files': [
           '../test_env.py',
           '<(PRODUCT_DIR)/browser_tests<(EXECUTABLE_SUFFIX)',
           '<(PRODUCT_DIR)/remoting/remoting.webapp/',
           '<(PRODUCT_DIR)/remoting/remoting.webapp.v2/',
+          '<(PRODUCT_DIR)/remoting/browser_test_resources/',
           '<(PRODUCT_DIR)/resources.pak',
           '../../remoting/tools/internal/test_accounts.json',
         ],
         'read_only': 1,
       },
     }],
     ['OS=="linux" or OS=="win"', {
       'variables': {
         'files': [
           '<(PRODUCT_DIR)/chrome_100_percent.pak',
@@ skipping 45 matching lines @@
           '--account-type=gmail',
         ],
       },
     }],
   ],
   'includes': [
     '../../base/base.isolate',
     '../../gin/v8.isolate',
   ],
 }