Upstream changes for NetworkQualityProvider

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 794053770c0da3d8cd42d65a29d46d995af1b199..94b65c416d072ac125feb5d13529650c1235bb18 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -179,6 +179,8 @@
       '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',
@@ -1760,6 +1762,7 @@
       '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',