Use ContextUtils in PhysicalWeb

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebDiagnosticsPage.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.physicalweb;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Build;
@@ skipping 86 matching lines @@
         sb.append(String.format("<font color=\"%s\">%s</font><br/>", color, message));
     }
 
     private void appendPrerequisitesReport(StringBuilder sb) {
         boolean isSdkVersionCorrect = isSdkVersionCorrect();
         boolean isDataConnectionActive = Utils.isDataConnectionActive(mContext);
         int bluetoothStatus = Utils.getBluetoothEnabledStatus(mContext);
         LocationUtils locationUtils = LocationUtils.getInstance();
         boolean isLocationServicesEnabled = locationUtils.isSystemLocationSettingEnabled(mContext);
         boolean isLocationPermissionGranted = locationUtils.hasAndroidLocationPermission(mContext);
-        boolean isPreferenceEnabled = PhysicalWeb.isPhysicalWebPreferenceEnabled(mContext);
-        boolean isOnboarding = PhysicalWeb.isOnboarding(mContext);
+        boolean isPreferenceEnabled = PhysicalWeb.isPhysicalWebPreferenceEnabled();
+        boolean isOnboarding = PhysicalWeb.isOnboarding();
 
         int prerequisitesResult = Utils.RESULT_SUCCESS;
         if (!isSdkVersionCorrect
                 || !isDataConnectionActive
                 || bluetoothStatus == Utils.RESULT_FAILURE
                 || !isLocationServicesEnabled
                 || !isLocationPermissionGranted
                 || !isPreferenceEnabled) {
             prerequisitesResult = Utils.RESULT_FAILURE;
         } else if (bluetoothStatus == Utils.RESULT_INDETERMINATE) {
@@ skipping 30 matching lines @@
 
         // Append instructions for how to verify Bluetooth is enabled when we are unable to check
         // programmatically.
         if (bluetoothStatus == Utils.RESULT_INDETERMINATE) {
             sb.append("<br/>To verify Bluetooth is enabled on this device, check that the "
                     + "Bluetooth icon is shown in the status bar.");
         }
     }
 
     private void appendUrlManagerReport(StringBuilder sb) {
-        UrlManager urlManager = UrlManager.getInstance(mContext);
+        UrlManager urlManager = UrlManager.getInstance();
 
         Set<String> nearbyUrls = new HashSet<>(urlManager.getNearbyUrls());
         Set<String> resolvedUrls = new HashSet<>(urlManager.getResolvedUrls());
         Set<String> union = new HashSet<>(nearbyUrls);
         union.addAll(resolvedUrls);
 
         sb.append("<h2>Nearby web pages</h2>");
 
         if (union.isEmpty()) {
             sb.append("No nearby web pages found<br/>");
@@ skipping 70 matching lines @@
     @Override
     public String getHost() {
         return UrlConstants.PHYSICAL_WEB_HOST;
     }
 
     @Override
     public void updateForUrl(String url) {
         // nothing to do
     }
 }