Upstream changes for NetworkQualityProvider

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 161 matching lines @@
       'browser/android/metrics/launch_metrics.cc',
       'browser/android/metrics/launch_metrics.h',
       'browser/android/metrics/uma_session_stats.cc',
       'browser/android/metrics/uma_session_stats.h',
       'browser/android/metrics/uma_utils.cc',
       'browser/android/metrics/uma_utils.h',
       'browser/android/metrics/variations_session.cc',
       'browser/android/metrics/variations_session.h',
       'browser/android/most_visited_sites.cc',
       'browser/android/most_visited_sites.h',
+      'browser/android/net/network_quality_provider.cc',
+      'browser/android/net/network_quality_provider.h',
       'browser/android/new_tab_page_prefs.cc',
       'browser/android/new_tab_page_prefs.h',
       'browser/android/new_tab_page_url_handler.cc',
       'browser/android/new_tab_page_url_handler.h',
       'browser/android/omnibox/answers_image_bridge.cc',
       'browser/android/omnibox/answers_image_bridge.h',
       'browser/android/omnibox/autocomplete_controller_android.cc',
       'browser/android/omnibox/autocomplete_controller_android.h',
       'browser/android/omnibox/omnibox_prerender.cc',
       'browser/android/omnibox/omnibox_prerender.h',
@@ skipping 1561 matching lines @@
       'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
       'android/java/src/org/chromium/chrome/browser/media/remote/RecordCastAction.java',
       'android/java/src/org/chromium/chrome/browser/media/remote/RemoteMediaPlayerBridge.java',
       'android/java/src/org/chromium/chrome/browser/metrics/UmaSessionStats.java',
       'android/java/src/org/chromium/chrome/browser/metrics/UmaUtils.java',
       'android/java/src/org/chromium/chrome/browser/metrics/VariationsSession.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/infobar/DownloadOverwriteInfoBar.java',
       'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBar.java',
+      'android/java/src/org/chromium/chrome/browser/net/qualityprovider/NetworkQualityProviderHelper.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/Credential.java',
       'android/java/src/org/chromium/chrome/browser/policy/PolicyManager.java',
       'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
@@ skipping 2315 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' ]
         },
       ],
     },],
   ],
 }