Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea

1 files changed, 6 insertions, 29 deletions

diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e050471f97..9814a4c192 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -72,8 +72,6 @@
         'common/cancelable_task_tracker.cc',
         'common/cancelable_task_tracker.h',
         'common/child_process_logging.h',
-        'common/child_process_logging_mac.mm',
-        'common/child_process_logging_posix.cc',
         'common/child_process_logging_win.cc',
         'common/chrome_content_client.cc',
         'common/chrome_content_client.h',
@@ -245,10 +243,6 @@
         'common/extensions/message_bundle.h',
         'common/extensions/mime_types_handler.cc',
         'common/extensions/mime_types_handler.h',
-        'common/extensions/permissions/api_permission.cc',
-        'common/extensions/permissions/api_permission.h',
-        'common/extensions/permissions/api_permission_set.cc',
-        'common/extensions/permissions/api_permission_set.h',
         'common/extensions/permissions/bluetooth_permission.cc',
         'common/extensions/permissions/bluetooth_permission.h',
         'common/extensions/permissions/bluetooth_permission_data.cc',
@@ -261,14 +255,12 @@
         'common/extensions/permissions/media_galleries_permission.h',
         'common/extensions/permissions/media_galleries_permission_data.cc',
         'common/extensions/permissions/media_galleries_permission_data.h',
-        'common/extensions/permissions/permission_message.cc',
-        'common/extensions/permissions/permission_message.h',
+        'common/extensions/permissions/permission_message_util.cc',
+        'common/extensions/permissions/permission_message_util.h',
         'common/extensions/permissions/permission_set.cc',
         'common/extensions/permissions/permission_set.h',
         'common/extensions/permissions/permissions_data.cc',
         'common/extensions/permissions/permissions_data.h',
-        'common/extensions/permissions/permissions_info.cc',
-        'common/extensions/permissions/permissions_info.h',
         'common/extensions/permissions/set_disjunction_permission.h',
         'common/extensions/permissions/socket_permission.cc',
         'common/extensions/permissions/socket_permission.h',
@@ -288,6 +280,8 @@
         'common/extensions/value_counter.h',
         'common/extensions/web_accessible_resources_handler.cc',
         'common/extensions/web_accessible_resources_handler.h',
+        'common/extensions/webview_handler.cc',
+        'common/extensions/webview_handler.h',
         'common/external_ipc_fuzzer.cc',
         'common/external_ipc_fuzzer.h',
         'common/favicon/favicon_types.cc',
@@ -335,8 +329,6 @@
         'common/mac/cfbundle_blocker.mm',
         'common/mac/launchd.h',
         'common/mac/launchd.mm',
-        'common/mac/nscoder_util.h',
-        'common/mac/nscoder_util.mm',
         'common/mac/objc_method_swizzle.h',
         'common/mac/objc_method_swizzle.mm',
         'common/mac/objc_zombie.h',
@@ -383,6 +375,8 @@
         'common/safe_browsing/zip_analyzer.h',
         'common/search_provider.h',
         'common/search_types.h',
+        'common/search_urls.cc',
+        'common/search_urls.h',
         'common/service_messages.h',
         'common/service_process_util.cc',
         'common/service_process_util.h',
@@ -402,13 +396,7 @@
         'common/thumbnail_score.h',
         'common/translate/language_detection_details.cc',
         'common/translate/language_detection_details.h',
-        'common/translate/language_detection_util.cc',
-        'common/translate/language_detection_util.h',
-        'common/translate/translate_common_metrics.cc',
-        'common/translate/translate_common_metrics.h',
         'common/translate/translate_errors.h',
-        'common/translate/translate_util.cc',
-        'common/translate/translate_util.h',
         'common/tts_messages.h',
         'common/tts_utterance_request.cc',
         'common/tts_utterance_request.h',
@@ -613,16 +601,6 @@
             'common/print_messages.h',
           ]
         }],
-        ['cld_version==0 or cld_version==1', {
-          'dependencies': [
-            '<(DEPTH)/third_party/cld/cld.gyp:cld',
-          ],
-        }],
-        ['cld_version==0 or cld_version==2', {
-          'dependencies': [
-            '<(DEPTH)/third_party/cld_2/cld_2.gyp:cld_2',
-          ],
-        }],
       ],
       'target_conditions': [
         ['OS == "ios"', {
@@ -630,7 +608,6 @@
             # Pull in specific Mac files for iOS (which have been filtered out
             # by file name rules).
             ['include', '^common/chrome_version_info_mac\\.mm$'],
-            ['include', '^common/mac/nscoder_util\\.'],
           ],
         }],
       ],