Merge java_staging/src into java/src.

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 1701 matching lines @@
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogControllerAndroid.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillKeyboardAccessoryBridge.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java',
       'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java',
       'android/java/src/org/chromium/chrome/browser/autofill/CardUnmaskBridge.java',
       'android/java/src/org/chromium/chrome/browser/autofill/CreditCardScanner.java',
       'android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java',
       'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java',
       'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java',
+      'android/java/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
       'android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java',
       'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
       'android/java/src/org/chromium/chrome/browser/child_accounts/ChildAccountService.java',
       'android/java/src/org/chromium/chrome/browser/child_accounts/ChildAccountFeedbackReporter.java',
       'android/java/src/org/chromium/chrome/browser/ChromiumApplication.java',
       'android/java/src/org/chromium/chrome/browser/ChromeBrowserProvider.java',
       'android/java/src/org/chromium/chrome/browser/ChromeHttpAuthHandler.java',
       'android/java/src/org/chromium/chrome/browser/ChromeWebContentsDelegateAndroid.java',
+      'android/java/src/org/chromium/chrome/browser/compositor/CompositorView.java',
       'android/java/src/org/chromium/chrome/browser/compositor/LayerTitleCache.java',
       'android/java/src/org/chromium/chrome/browser/compositor/layouts/content/TabContentManager.java',
+      'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
+      'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/SceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/StaticTabSceneLayer.java',
+      'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
+      'android/java/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
       'android/java/src/org/chromium/chrome/browser/ConnectionInfoPopup.java',
       'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuHelper.java',
       'android/java/src/org/chromium/chrome/browser/contextmenu/ContextMenuParams.java',
+      'android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
+      'android/java/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
       'android/java/src/org/chromium/chrome/browser/cookies/CookiesFetcher.java',
       'android/java/src/org/chromium/chrome/browser/DevToolsServer.java',
       'android/java/src/org/chromium/chrome/browser/database/SQLiteCursor.java',
+      'android/java/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerFeedbackReporter.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java',
       'android/java/src/org/chromium/chrome/browser/download/ChromeDownloadDelegate.java',
       'android/java/src/org/chromium/chrome/browser/enhanced_bookmarks/EnhancedBookmarksBridge.java',
       'android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java',
       'android/java/src/org/chromium/chrome/browser/favicon/LargeIconBridge.java',
       'android/java/src/org/chromium/chrome/browser/feedback/ConnectivityChecker.java',
       'android/java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java',
       'android/java/src/org/chromium/chrome/browser/fullscreen/FullscreenInfoBarDelegate.java',
@@ skipping 26 matching lines @@
       'android/java/src/org/chromium/chrome/browser/precache/PrecacheLauncher.java',
       'android/java/src/org/chromium/chrome/browser/preferences/autofill/AutofillProfileBridge.java',
       'android/java/src/org/chromium/chrome/browser/preferences/LocationSettings.java',
       'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',
       'android/java/src/org/chromium/chrome/browser/preferences/website/WebsitePreferenceBridge.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/rlz/RevenueStats.java',
       'android/java/src/org/chromium/chrome/browser/ShortcutHelper.java',
       'android/java/src/org/chromium/chrome/browser/SSLClientCertificateRequest.java',
       'android/java/src/org/chromium/chrome/browser/search_engines/TemplateUrlService.java',
       'android/java/src/org/chromium/chrome/browser/signin/AccountManagementScreenHelper.java',
       'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',
       'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
       'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
       'android/java/src/org/chromium/chrome/browser/tab/BackgroundContentViewHelper.java',
+      'android/java/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
       'android/java/src/org/chromium/chrome/browser/tabmodel/SingleTabModel.java',
       'android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java',
       'android/java/src/org/chromium/chrome/browser/Tab.java',
       'android/java/src/org/chromium/chrome/browser/TabState.java',
       'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
       'android/java/src/org/chromium/chrome/browser/UrlUtilities.java',
       'android/java/src/org/chromium/chrome/browser/WarmupManager.java',
       'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
       'android/java/src/org/chromium/chrome/browser/WebContentsFactory.java',
       'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
       'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarAndroid.java',
       'android/java/src/org/chromium/chrome/browser/infobar/AccountChooserInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/AppBannerInfoBarDelegateAndroid.java',
       'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
       'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
       'android/java/src/org/chromium/chrome/browser/metrics/LaunchMetrics.java',
       'android/java/src/org/chromium/chrome/browser/ssl/ConnectionSecurity.java',
       'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java',
-      'android/java_staging/src/org/chromium/chrome/browser/bookmark/EditBookmarkHelper.java',
-      'android/java_staging/src/org/chromium/chrome/browser/compositor/CompositorView.java',
-      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ContextualSearchSceneLayer.java',
-      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/ReaderModeSceneLayer.java',
-      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabListSceneLayer.java',
-      'android/java_staging/src/org/chromium/chrome/browser/compositor/scene_layer/TabStripSceneLayer.java',
-      'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManager.java',
-      'android/java_staging/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchTabHelper.java',
-      'android/java_staging/src/org/chromium/chrome/browser/document/DocumentWebContentsDelegate.java',
-      'android/java_staging/src/org/chromium/chrome/browser/rlz/RevenueStats.java',
-      'android/java_staging/src/org/chromium/chrome/browser/tab/ThumbnailTabHelper.java',
     ],
     'chrome_browser_mdns_sources': [
       'browser/local_discovery/privet_traffic_detector.cc',
       'browser/local_discovery/privet_traffic_detector.h',
       'browser/local_discovery/service_discovery_client_mdns.cc',
       'browser/local_discovery/service_discovery_client_mdns.h',
       'browser/local_discovery/service_discovery_client_utility.cc',
       'browser/local_discovery/service_discovery_client_utility.h',
       'browser/local_discovery/service_discovery_host_client.cc',
       'browser/local_discovery/service_discovery_host_client.h',
@@ skipping 2224 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' ]
         },
       ],
     },],
   ],
 }