Merge 232631 "This CL broke the official builders."

extensions/extensions.gyp

 # Copyright 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
@@ skipping 41 matching lines @@
         'common/features/feature_provider.cc',
         'common/features/feature_provider.h',
         'common/id_util.cc',
         'common/id_util.h',
         'common/install_warning.cc',
         'common/install_warning.h',
         'common/manifest.cc',
         'common/manifest.h',
         'common/manifest_constants.cc',
         'common/manifest_constants.h',
-        'common/manifest_handler.cc',
-        'common/manifest_handler.h',
         'common/matcher/regex_set_matcher.cc',
         'common/matcher/regex_set_matcher.h',
         'common/matcher/string_pattern.cc',
         'common/matcher/string_pattern.h',
         'common/matcher/substring_set_matcher.cc',
         'common/matcher/substring_set_matcher.h',
         'common/matcher/url_matcher.cc',
         'common/matcher/url_matcher.h',
         'common/matcher/url_matcher_constants.cc',
         'common/matcher/url_matcher_constants.h',
@@ skipping 70 matching lines @@
         'browser/pref_names.cc',
         'browser/pref_names.h',
         'browser/view_type_utils.cc',
         'browser/view_type_utils.h',
       ],
       # Disable c4267 warnings until we fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
     },
   ]
 }