diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 09:59:13 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-20 10:28:53 +0000 |
| commit | 6c11fb357ec39bf087b8b632e2b1e375aef1b38b (patch) | |
| tree | c8315530db18a8ee566521c39ab8a6af4f72bc03 /chromium/components/network_time | |
| parent | 3ffaed019d0772e59d6cdb2d0d32fe4834c31f72 (diff) | |
| download | qtwebengine-chromium-6c11fb357ec39bf087b8b632e2b1e375aef1b38b.tar.gz | |
BASELINE: Update Chromium to 74.0.3729.159
Change-Id: I8d2497da544c275415aedd94dd25328d555de811
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/network_time')
4 files changed, 6 insertions, 5 deletions
diff --git a/chromium/components/network_time/network_time_test_utils.cc b/chromium/components/network_time/network_time_test_utils.cc index d5016d28bea..984da34c7de 100644 --- a/chromium/components/network_time/network_time_test_utils.cc +++ b/chromium/components/network_time/network_time_test_utils.cc @@ -70,7 +70,7 @@ void FieldTrialTest::SetNetworkQueriesWithVariationsService( std::map<std::string, std::string> params; params["RandomQueryProbability"] = base::NumberToString(query_probability); - params["CheckTimeIntervalSeconds"] = base::Int64ToString(360); + params["CheckTimeIntervalSeconds"] = base::NumberToString(360); std::string fetch_behavior_param; switch (fetch_behavior) { case NetworkTimeTracker::FETCH_BEHAVIOR_UNKNOWN: diff --git a/chromium/components/network_time/network_time_test_utils.h b/chromium/components/network_time/network_time_test_utils.h index 656ed4770db..b99cf7a834b 100644 --- a/chromium/components/network_time/network_time_test_utils.h +++ b/chromium/components/network_time/network_time_test_utils.h @@ -14,7 +14,7 @@ namespace base { namespace test { class ScopedFeatureList; -}; // namespace test +} // namespace test class FieldTrialList; } // namespace base diff --git a/chromium/components/network_time/network_time_tracker.cc b/chromium/components/network_time/network_time_tracker.cc index 34386ad169f..c4d92f26cf4 100644 --- a/chromium/components/network_time/network_time_tracker.cc +++ b/chromium/components/network_time/network_time_tracker.cc @@ -9,6 +9,7 @@ #include <string> #include <utility> +#include "base/bind.h" #include "base/i18n/time_formatting.h" #include "base/json/json_reader.h" #include "base/logging.h" @@ -173,8 +174,7 @@ void RecordFetchValidHistogram(bool valid) { // static void NetworkTimeTracker::RegisterPrefs(PrefRegistrySimple* registry) { - registry->RegisterDictionaryPref(prefs::kNetworkTimeMapping, - std::make_unique<base::DictionaryValue>()); + registry->RegisterDictionaryPref(prefs::kNetworkTimeMapping); registry->RegisterBooleanPref(prefs::kNetworkTimeQueriesEnabled, true); } @@ -514,7 +514,7 @@ bool NetworkTimeTracker::UpdateTimeFromResponse( return false; } data = data.substr(5); // Skips leading )]}'\n - std::unique_ptr<base::Value> value = base::JSONReader::Read(data); + std::unique_ptr<base::Value> value = base::JSONReader::ReadDeprecated(data); if (!value) { DVLOG(1) << "bad JSON"; RecordFetchValidHistogram(false); diff --git a/chromium/components/network_time/network_time_tracker_unittest.cc b/chromium/components/network_time/network_time_tracker_unittest.cc index e6b9b0ffd9f..364efa2d2f6 100644 --- a/chromium/components/network_time/network_time_tracker_unittest.cc +++ b/chromium/components/network_time/network_time_tracker_unittest.cc @@ -8,6 +8,7 @@ #include <string> #include <utility> +#include "base/bind.h" #include "base/compiler_specific.h" #include "base/run_loop.h" #include "base/stl_util.h" |