Merge 232631 "This CL broke the official builders."

chrome/chrome_common.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'common',
       'type': 'static_library',
       'variables': {
@@ skipping 187 matching lines @@
         'common/extensions/features/feature_channel.cc',
         'common/extensions/features/feature_channel.h',
         'common/extensions/features/manifest_feature.cc',
         'common/extensions/features/manifest_feature.h',
         'common/extensions/features/permission_feature.cc',
         'common/extensions/features/permission_feature.h',
         'common/extensions/features/simple_feature.cc',
         'common/extensions/features/simple_feature.h',
         'common/extensions/incognito_handler.cc',
         'common/extensions/incognito_handler.h',
+        'common/extensions/manifest_handler.cc',
+        'common/extensions/manifest_handler.h',
         'common/extensions/manifest_handler_helpers.cc',
         'common/extensions/manifest_handler_helpers.h',
         'common/extensions/manifest_handlers/app_isolation_info.cc',
         'common/extensions/manifest_handlers/app_isolation_info.h',
         'common/extensions/manifest_handlers/app_launch_info.cc',
         'common/extensions/manifest_handlers/app_launch_info.h',
         'common/extensions/manifest_handlers/content_scripts_handler.cc',
         'common/extensions/manifest_handlers/content_scripts_handler.h',
         'common/extensions/manifest_handlers/externally_connectable.cc',
         'common/extensions/manifest_handlers/externally_connectable.h',
@@ skipping 558 matching lines @@
         'common/metrics/proto/user_action_event.proto',
       ],
       'variables': {
         'proto_in_dir': 'common/metrics/proto',
         'proto_out_dir': 'chrome/common/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }