Revert of Add access to Physical Web Service results (patchset #5 id:80001 of...

Revert of Add access to Physical Web Service results (patchset #5 id:80001 of https://codereview.chromium.org/2330253002/ )

Reason for revert:
Broke build (compile): https://build.chromium.org/p/chromium.linux/builders/Android%20Clang%20Builder%20%28dbg%29/builds/87504/steps/compile/logs/stdio

********************************************************************************
FindBugs run via:
java -classpath /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/third_party/findbugs/lib/findbugs.jar: -Xmx768m -Dfindbugs.home="/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/third_party/findbugs" -jar /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/third_party/findbugs/lib/findbugs.jar -textui -sortByClass -pluginList /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/tools/android/findbugs_plugin/lib/chromiumPlugin.jar -xml:withMessages -auxclasspath /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/third_party/android_tools/sdk/platforms/android-23/android.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/base/base_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/chrome/android/webapk/libs/client/client_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/chrome/android/webapk/libs/common/common_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/chrome/android/webapk/libs/runtime_library/webapk_service_aidl_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/safe_json/android/safe_json_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/spellcheck/browser/android/java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/variations/android/variations_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/web_contents_delegate_android/web_contents_delegate_android_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/web_restrictions/web_restrictions_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/content/public/android/content_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/device/geolocation/geolocation_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/media/base/android/media_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/media/capture/content/android/screen_capture_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/media/capture/video/android/capture_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/media/midi/midi_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/mojo/public/java/bindings.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/mojo/public/java/system.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/net/android/net_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/printing/printing_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/WebKit/public/android_mojo_bindings_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/WebKit/public/blink_headers_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_data_chart/android_data_chart_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_media/android_media_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_protobuf/protobuf_nano_javalib.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_swipe_refresh/android_swipe_refresh_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_gcm_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_annotations_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_design_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v13_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v13_java__subjar_internal_impl_24.1.1.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v4_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v4_java__subjar_internal_impl_24.1.1.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v7_appcompat_java_internal__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_vector_drawable_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v7_mediarouter_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v7_mediarouter_java__subjar_internal_impl_24.1.1.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/android_support_v7_recyclerview_java__classes.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/cacheinvalidation/cacheinvalidation_javalib.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/cacheinvalidation/cacheinvalidation_proto_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/custom_tabs_client/custom_tabs_support_lib.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/gif_player/gif_player_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/jsr-305/jsr_305_javalib.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/leakcanary/leakcanary_noop_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/ui/android/ui_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/url/mojo/url_mojom_gurl_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/third_party/android_tools/google_play_services_default_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/chrome/android/document_tab_model_info_proto_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/blimp/client/public/public_headers_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/blimp/client/core/dummy_core_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/bookmarks/common/android/bookmarks_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/dom_distiller/content/browser/android/dom_distiller_content_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/dom_distiller/core/android/dom_distiller_core_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/gcm_driver/android/gcm_driver_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/gcm_driver/instance_id/android/instance_id_driver_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/invalidation/impl/java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/location/android/location_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/navigation_interception/android/navigation_interception_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/ntp_tiles/android/ntp_tiles_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/policy/android/policy_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/precache/android/precache_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/safe_json/android/safe_json_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/signin/core/browser/android/java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/sync/android/sync_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/url_formatter/android/url_formatter_java.jar:/mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/components/web_contents_delegate_android/web_contents_delegate_android_java.jar -exclude /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/build/android/findbugs_filter/findbugs_exclude.xml -output gen/chrome/android/chrome_java__findbugs/result.xml /mnt/data/b/c/b/Android_Clang_Builder__dbg_/src/out/Debug/lib.java/chrome/android/chrome_java.jar

FindBugs reported the following issues:
EI_EXPOSE_REP2: May expose internal representation by incorporating reference to mutable object
  In class org.chromium.chrome.browser.physicalweb.PwCollection
  In method new org.chromium.chrome.browser.physicalweb.PwCollection(UrlInfo[], PwsResult[])
  Field org.chromium.chrome.browser.physicalweb.PwCollection.urlInfos
  At PwCollection.java:[line 20]
EI_EXPOSE_REP2: May expose internal representation by incorporating reference to mutable object
  In class org.chromium.chrome.browser.physicalweb.PwCollection
  In method new org.chromium.chrome.browser.physicalweb.PwCollection(UrlInfo[], PwsResult[])
  Field org.chromium.chrome.browser.physicalweb.PwCollection.pwsResults
  At PwCollection.java:[line 21]
********************************************************************************

Original issue's description:
> Add access to Physical Web Service results
>
> To allow access to Physical Web data, the URL info and Physical Web
> Service data needs to be paired together. The pairing gives all relevant
> information for a scanned URL.
>
> BUG=636490
>
> Committed: https://crrev.com/576c1dde62f1bc26e4366d50b32f76a636a1dbbd
> Cr-Commit-Position: refs/heads/master@{#419531}

TBR=cco3@chromium.org,dfalcantara@chromium.org,hayesjordan@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=636490

Review-Url: https://codereview.chromium.org/2356553002
Cr-Commit-Position: refs/heads/master@{#419554}

chrome/android/java/src/org/chromium/chrome/browser/physicalweb/PwCollection.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;
-
-/**
- * A physical web collection stores UrlInfos and PwsResults for scanned URLs.
- */
-public class PwCollection {
-    public final UrlInfo[] urlInfos;
-    public final PwsResult[] pwsResults;
-
-    /**
-     * Construct a PwCollection.
-     * @param urlInfos All nearby URL infos.
-     * @param pwsResults The metadata for nearby URLs.
-     */
-    public PwCollection(UrlInfo[] urlInfos, PwsResult[] pwsResults) {
-        this.urlInfos = urlInfos;
-        this.pwsResults = pwsResults;
-    }
-}

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

@@ -251,18 +251,6 @@ class UrlManager {
         return mPwsResultMap.keySet();
     }
 
-    /**
-     * Gets all UrlInfos and PwsResults for resolved URLs.
-     */
-    public PwCollection getPwCollection() {
-        List<PwsResult> nearbyPwsResults = new ArrayList<>();
-        for (String url : mNearbyUrls) {
-            nearbyPwsResults.add(mPwsResultMap.get(url));
-        }
-        return new PwCollection(getUrlInfoList(mNearbyUrls).toArray(new UrlInfo[0]),
-                nearbyPwsResults.toArray(new PwsResult[0]));
-    }
-
     /**
      * Forget all stored URLs and clear the notification.
      */

chrome/android/java_sources.gni

@@ -690,7 +690,6 @@ chrome_java_sources = [
   "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebEnvironment.java",
   "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebOptInActivity.java",
   "java/src/org/chromium/chrome/browser/physicalweb/PhysicalWebUma.java",
-  "java/src/org/chromium/chrome/browser/physicalweb/PwCollection.java",
   "java/src/org/chromium/chrome/browser/physicalweb/PwsClient.java",
   "java/src/org/chromium/chrome/browser/physicalweb/PwsClientImpl.java",
   "java/src/org/chromium/chrome/browser/physicalweb/PwsResult.java",

chrome/android/javatests/src/org/chromium/chrome/browser/physicalweb/UrlManagerTest.java

@@ -464,22 +464,4 @@ public class UrlManagerTest extends InstrumentationTestCase {
         assertEquals(UrlManager.getVersion(),
                 mSharedPreferences.getInt(UrlManager.getVersionKey(), 0));
     }
-
-    @SmallTest
-    public void testGetPwCollection() {
-        assertEquals(0, mUrlManager.getPwCollection().urlInfos.length);
-        assertEquals(0, mUrlManager.getPwCollection().pwsResults.length);
-        addPwsResult1();
-        long curTime = System.currentTimeMillis();
-        mUrlManager.addUrl(new UrlInfo(URL1, 99.5, curTime + 42));
-        getInstrumentation().waitForIdleSync();
-        assertEquals(1, mUrlManager.getPwCollection().urlInfos.length);
-        assertEquals(1, mUrlManager.getPwCollection().pwsResults.length);
-
-        addPwsResult2();
-        mUrlManager.addUrl(new UrlInfo(URL2, 99.5, curTime + 42));
-        getInstrumentation().waitForIdleSync();
-        assertEquals(2, mUrlManager.getPwCollection().urlInfos.length);
-        assertEquals(2, mUrlManager.getPwCollection().pwsResults.length);
-    }
 }