Merge java_staging/src into java/src.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 231061a9420dacb52fb9173e36604732c0730606..ee03ebc85bd14bab92ca51c55f4621349e3c4339 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1715,6 +1715,7 @@
       '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',
@@ -1723,16 +1724,24 @@
       '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',
@@ -1779,6 +1788,7 @@
       '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',
@@ -1787,6 +1797,7 @@
       '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',
@@ -1810,17 +1821,6 @@
       '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',