This is an exact copy of rolledback CL 13947013 with a fix to a compliation

chrome/chrome_browser.gypi

 # Copyright 2012 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': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 2030 matching lines @@
         'browser/themes/theme_service.cc',
         'browser/themes/theme_service_factory.cc',
         'browser/themes/theme_service_factory.h',
         'browser/themes/theme_service.h',
         'browser/themes/theme_service_gtk.cc',
         'browser/themes/theme_service_mac.mm',
         'browser/themes/theme_syncable_service.cc',
         'browser/themes/theme_syncable_service.h',
         'browser/three_d_api_observer.cc',
         'browser/three_d_api_observer.h',
+        'browser/thumbnails/content_analysis.cc',
+        'browser/thumbnails/content_analysis.h',
         'browser/thumbnails/simple_thumbnail_crop.cc',
         'browser/thumbnails/simple_thumbnail_crop.h',
         'browser/thumbnails/render_widget_snapshot_taker.cc',
         'browser/thumbnails/render_widget_snapshot_taker.h',
         'browser/thumbnails/thumbnail_service.h',
         'browser/thumbnails/thumbnail_service_factory.cc',
         'browser/thumbnails/thumbnail_service_factory.h',
         'browser/thumbnails/thumbnail_service_impl.cc',
         'browser/thumbnails/thumbnail_service_impl.h',
         'browser/thumbnails/thumbnail_tab_helper.cc',
@@ skipping 972 matching lines @@
             'package_name': 'org/chromium/chrome/browser/ui/toolbar',
             'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
           },
           'includes': [ '../build/android/java_cpp_template.gypi' ],
         },
       ],
      },
     ],
   ],
 }