1 files changed, 20 insertions, 13 deletions

diff --git a/chromium/services/device/geolocation/network_location_provider_unittest.cc b/chromium/services/device/geolocation/network_location_provider_unittest.cc
index 9cb67fb166c..0d58ac142c1 100644
--- a/chromium/services/device/geolocation/network_location_provider_unittest.cc
+++ b/chromium/services/device/geolocation/network_location_provider_unittest.cc
@@ -14,7 +14,6 @@
 #include "base/bind.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
-#include "base/macros.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ -80,6 +79,9 @@ class MockWifiDataProvider : public WifiDataProvider {
 
   MockWifiDataProvider() : start_calls_(0), stop_calls_(0), got_data_(true) {}
 
+  MockWifiDataProvider(const MockWifiDataProvider&) = delete;
+  MockWifiDataProvider& operator=(const MockWifiDataProvider&) = delete;
+
   // WifiDataProvider implementation.
   void StartDataProvider() override { ++start_calls_; }
 
@@ -117,8 +119,6 @@ class MockWifiDataProvider : public WifiDataProvider {
 
   WifiData data_;
   bool got_data_;
-
-  DISALLOW_COPY_AND_ASSIGN(MockWifiDataProvider);
 };
 
 MockWifiDataProvider* MockWifiDataProvider::instance_ = nullptr;
@@ -227,7 +227,10 @@ class GeolocationNetworkProviderTest : public testing::Test {
     pos.longitude = -(id + 1);
     pos.altitude = 2 * id;
     pos.accuracy = 3 * id;
-    pos.timestamp = base::Time::Now();
+    // Ensure last_position.timestamp be earlier than any future calls to
+    // base::time::Now() as well as not old enough to be considered invalid
+    // (kLastPositionMaxAgeSeconds)
+    pos.timestamp = base::Time::Now() - base::Minutes(5);
     return pos;
   }
 
@@ -300,17 +303,21 @@ class GeolocationNetworkProviderTest : public testing::Test {
       ASSERT_TRUE(
           JsonGetList("wifiAccessPoints", *request_json, &wifi_aps_json));
       for (size_t i = 0; i < expected_wifi_aps_json.GetList().size(); ++i) {
-        const base::DictionaryValue* expected_json;
-        ASSERT_TRUE(expected_wifi_aps_json.GetDictionary(i, &expected_json));
-        const base::DictionaryValue* actual_json;
-        ASSERT_TRUE(wifi_aps_json->GetDictionary(i, &actual_json));
+        const base::Value& expected_json_value =
+            expected_wifi_aps_json.GetList()[i];
+        ASSERT_TRUE(expected_json_value.is_dict());
+        const base::DictionaryValue& expected_json =
+            base::Value::AsDictionaryValue(expected_json_value);
+        const base::Value& actual_json_value = wifi_aps_json->GetList()[i];
+        ASSERT_TRUE(actual_json_value.is_dict());
+        const base::DictionaryValue& actual_json =
+            base::Value::AsDictionaryValue(actual_json_value);
+        ASSERT_TRUE(JsonFieldEquals("macAddress", expected_json, actual_json));
         ASSERT_TRUE(
-            JsonFieldEquals("macAddress", *expected_json, *actual_json));
+            JsonFieldEquals("signalStrength", expected_json, actual_json));
+        ASSERT_TRUE(JsonFieldEquals("channel", expected_json, actual_json));
         ASSERT_TRUE(
-            JsonFieldEquals("signalStrength", *expected_json, *actual_json));
-        ASSERT_TRUE(JsonFieldEquals("channel", *expected_json, *actual_json));
-        ASSERT_TRUE(JsonFieldEquals("signalToNoiseRatio", *expected_json,
-                                    *actual_json));
+            JsonFieldEquals("signalToNoiseRatio", expected_json, actual_json));
       }
     } else {
       ASSERT_FALSE(request_json->HasKey("wifiAccessPoints"));