Use ContextUtils in PhysicalWeb

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

 // Copyright 2015 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.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
 import android.animation.ObjectAnimator;
 import android.content.Context;
@@ skipping 14 matching lines @@
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 
 import org.chromium.base.ApiCompatibilityUtils;
 import org.chromium.base.ContextUtils;
 import org.chromium.base.Log;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.ChromeApplication;
 import org.chromium.chrome.browser.widget.FadingShadow;
 import org.chromium.chrome.browser.widget.FadingShadowView;
 
 import java.util.Collection;
 
 /**
  * This activity displays a list of nearby URLs as stored in the {@link UrlManager}.
  * This activity does not and should not rely directly or indirectly on the native library.
  */
 public class ListUrlsActivity extends AppCompatActivity implements AdapterView.OnItemClickListener,
@@ skipping 69 matching lines @@
         });
 
         mPwsClient = new PwsClientImpl(this);
         int referer = getIntent().getIntExtra(REFERER_KEY, 0);
         if (savedInstanceState == null) {  // Ensure this is a newly-created activity.
             PhysicalWebUma.onActivityReferral(this, referer);
         }
         mIsInitialDisplayRecorded = false;
         mIsRefreshing = false;
         mIsRefreshUserInitiated = false;
-        mPhysicalWebBleClient =
-            PhysicalWebBleClient.getInstance((ChromeApplication) getApplicationContext());
+        mPhysicalWebBleClient = PhysicalWebBleClient.getInstance();
     }
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         int tintColor = ContextCompat.getColor(this, R.color.light_normal_color);
 
         Drawable tintedRefresh = ContextCompat.getDrawable(this, R.drawable.btn_toolbar_reload);
         tintedRefresh.setColorFilter(tintColor, PorterDuff.Mode.SRC_IN);
         menu.add(0, R.id.menu_id_refresh, 1, R.string.physical_web_refresh)
                 .setIcon(tintedRefresh)
@@ skipping 25 matching lines @@
         mPhysicalWebBleClient.foregroundSubscribe(this);
     }
 
     private void foregroundUnsubscribe() {
         mPhysicalWebBleClient.foregroundUnsubscribe();
     }
 
     @Override
     protected void onStart() {
         super.onStart();
-        UrlManager.getInstance(this).addObserver(this);
+        UrlManager.getInstance().addObserver(this);
     }
 
     @Override
     protected void onResume() {
         super.onResume();
         foregroundSubscribe();
         startRefresh(false, false);
 
         int bottomBarDisplayCount = getBottomBarDisplayCount();
         if (bottomBarDisplayCount < BOTTOM_BAR_DISPLAY_LIMIT) {
             showBottomBar();
             setBottomBarDisplayCount(bottomBarDisplayCount + 1);
         }
     }
 
     @Override
     protected void onPause() {
         foregroundUnsubscribe();
         super.onPause();
     }
 
     @Override
     public void onRefresh() {
         startRefresh(true, true);
     }
 
     @Override
     protected void onStop() {
-        UrlManager.getInstance(this).removeObserver(this);
+        UrlManager.getInstance().removeObserver(this);
         super.onStop();
     }
 
     private void resolve(Collection<UrlInfo> urls, final boolean isUserInitiated) {
         final long timestamp = SystemClock.elapsedRealtime();
         mPwsClient.resolve(urls, new PwsClient.ResolveScanCallback() {
             @Override
             public void onPwsResults(Collection<PwsResult> pwsResults) {
                 long duration = SystemClock.elapsedRealtime() - timestamp;
                 if (isUserInitiated) {
@@ skipping 48 matching lines @@
         if (mIsRefreshing) {
             return;
         }
 
         mIsRefreshing = true;
         mIsRefreshUserInitiated = isUserInitiated;
 
         // Clear the list adapter to trigger the empty list display.
         mAdapter.clear();
 
-        Collection<UrlInfo> urls = UrlManager.getInstance(this).getUrls(true);
+        Collection<UrlInfo> urls = UrlManager.getInstance().getUrls(true);
 
         // Check the Physical Web preference to ensure we do not resolve URLs when Physical Web is
         // off or onboarding. Normally the user will not reach this activity unless the preference
         // is explicitly enabled, but there is a button on the diagnostics page that launches into
         // the activity without checking the preference state.
-        if (urls.isEmpty() || !PhysicalWeb.isPhysicalWebPreferenceEnabled(this)) {
+        if (urls.isEmpty() || !PhysicalWeb.isPhysicalWebPreferenceEnabled()) {
             finishRefresh();
         } else {
             // Show the swipe-to-refresh busy indicator for refreshes initiated by a swipe.
             if (isSwipeInitiated) {
                 mSwipeRefreshWidget.setRefreshing(true);
             }
 
             // Update the empty list view to show a scanning animation.
             mEmptyListText.setText(R.string.physical_web_empty_list_scanning);
 
@@ skipping 103 matching lines @@
     @VisibleForTesting
     void overridePwsClientForTesting(PwsClient pwsClient) {
         mPwsClient = pwsClient;
     }
 
     @VisibleForTesting
     void overrideContextForTesting(Context context) {
         mContext = context;
     }
 }