Upstream changes to chrome_browser.gypi.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2efb334fca2696e8779d4f67890745de7fcf8e1a..d28c23c4d0b7c3ae7f2d135b2faf2cb8129a25e4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2283,6 +2283,7 @@
           ],
         }, {  # safe_browsing==0
           'dependencies!': [
+            'safe_browsing_proto',
             'safe_browsing_report_proto',
             '../third_party/libusb/libusb.gyp:libusb',
           ],
@@ -2565,6 +2566,7 @@
             'browser/web_resource/notification_promo_mobile_ntp.h',
           ],
           'sources!': [
+            'browser/bookmarks/bookmark_drop_info.cc',
             # Bookmark export/import are handled via the BookmarkColumns
             # ContentProvider.
             'browser/bookmarks/bookmark_html_writer.cc',
@@ -2585,12 +2587,25 @@
             'browser/managed_mode/managed_mode_url_filter.cc',
             'browser/managed_mode/managed_mode_url_filter.h',
             'browser/net/gaia/gaia_oauth_fetcher.cc',
+            'browser/omnibox_search_hint.cc',
             'browser/page_cycler/page_cycler.cc',
             'browser/page_cycler/page_cycler.h',
             'browser/sessions/persistent_tab_restore_service.cc',
             'browser/sessions/persistent_tab_restore_service.h',
             'browser/sessions/session_backend.cc',
             'browser/sessions/session_backend.h',
+            'browser/tab_contents/background_contents.cc',
+            'browser/tab_contents/background_contents.h',
+            'browser/tab_contents/render_view_context_menu.cc',
+            'browser/tab_contents/render_view_context_menu.h',
+            'browser/tab_contents/render_view_context_menu_observer.cc',
+            'browser/tab_contents/render_view_context_menu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
+            'browser/tab_contents/spelling_bubble_model.cc',
+            'browser/tab_contents/spelling_bubble_model.h',
+            'browser/tab_contents/spelling_menu_observer.cc',
+            'browser/tab_contents/spelling_menu_observer.h',
             'browser/upgrade_detector.cc',
             'browser/upgrade_detector.h',
             'browser/upgrade_detector_impl.cc',
@@ -2612,6 +2627,7 @@
             ['exclude', '^browser/speech/'],
             ['exclude', '^browser/sync/glue/app_'],
             ['exclude', '^browser/sync/glue/extension_'],
+            ['exclude', '^browser/sync/glue/theme_'],
             ['exclude', '^browser/usb/'],
           ],
         }],