Upstream partner customizations.

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.
 
 {
   'variables': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 21 matching lines @@
       'browser/android/banners/app_banner_manager.cc',
       'browser/android/banners/app_banner_manager.h',
       'browser/android/banners/app_banner_metrics_id_list.h',
       'browser/android/banners/app_banner_metrics_ids.h',
       'browser/android/banners/app_banner_settings_helper.cc',
       'browser/android/banners/app_banner_settings_helper.h',
       'browser/android/banners/app_banner_utilities.cc',
       'browser/android/banners/app_banner_utilities.h',
       'browser/android/bookmarks/bookmarks_bridge.cc',
       'browser/android/bookmarks/bookmarks_bridge.h',
+      'browser/android/bookmarks/partner_bookmarks_reader.cc',
+      'browser/android/bookmarks/partner_bookmarks_reader.h',
       'browser/android/bookmarks/partner_bookmarks_shim.cc',
       'browser/android/bookmarks/partner_bookmarks_shim.h',
       'browser/android/chrome_jni_registrar.cc',
       'browser/android/chrome_jni_registrar.h',
       'browser/android/chrome_startup_flags.cc',
       'browser/android/chrome_startup_flags.h',
       'browser/android/chrome_web_contents_delegate_android.cc',
       'browser/android/chrome_web_contents_delegate_android.h',
       'browser/android/chromium_application.cc',
       'browser/android/chromium_application.h',
@@ skipping 1530 matching lines @@
       'android/java/src/org/chromium/chrome/browser/IntentHelper.java',
       'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
       'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
       'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',
       'android/java/src/org/chromium/chrome/browser/notifications/NotificationUIManager.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java',
       'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java',
+      'android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java',
       'android/java/src/org/chromium/chrome/browser/password_manager/PasswordAuthenticationManager.java',
       'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
       'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',
       'android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java',
       'android/java/src/org/chromium/chrome/browser/profiles/Profile.java',
       'android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java',
       'android/java/src/org/chromium/chrome/browser/prerender/ExternalPrerenderHandler.java',
       'android/java/src/org/chromium/chrome/browser/RecentlyClosedBridge.java',
       'android/java/src/org/chromium/chrome/browser/ShortcutHelper.java',
       'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
@@ skipping 2112 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }