Merge branch 'trunk' of http://git.chromium.org/git/chromium into autofill

chrome/chrome_browser.gypi

 # Copyright (c) 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',
@@ skipping 150 matching lines @@
         'browser/autofill/address_field.h',
         'browser/autofill/autofill-inl.h',
         'browser/autofill/autofill_cc_infobar_delegate.cc',
         'browser/autofill/autofill_cc_infobar_delegate.h',
         'browser/autofill/autofill_country.cc',
         'browser/autofill/autofill_country.h',
         'browser/autofill/autofill_download.cc',
         'browser/autofill/autofill_download.h',
         'browser/autofill/autofill_external_delegate.cc',
         'browser/autofill/autofill_external_delegate.h',
-        'browser/autofill/autofill_external_delegate_android.cc',
         'browser/autofill/autofill_external_delegate_gtk.cc',
         'browser/autofill/autofill_external_delegate_gtk.h',
         'browser/autofill/autofill_feedback_infobar_delegate.cc',
         'browser/autofill/autofill_feedback_infobar_delegate.h',
         'browser/autofill/autofill_field.cc',
         'browser/autofill/autofill_field.h',
         'browser/autofill/autofill_ie_toolbar_import_win.cc',
         'browser/autofill/autofill_ie_toolbar_import_win.h',
         'browser/autofill/autofill_manager.cc',
         'browser/autofill/autofill_manager.h',
@@ skipping 5164 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }