BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 6 insertions, 10 deletions

diff --git a/chromium/components/metrics/metrics_service.h b/chromium/components/metrics/metrics_service.h
index dab73c84e41..b42bb611318 100644
--- a/chromium/components/metrics/metrics_service.h
+++ b/chromium/components/metrics/metrics_service.h
@@ -171,9 +171,6 @@ class MetricsService : public base::HistogramFlattener {
   // Clears the stability metrics that are saved in local state.
   void ClearSavedStabilityMetrics();
 
-  // Pushes a log that has been generated by an external component.
-  void PushExternalLog(const std::string& log);
-
   variations::SyntheticTrialRegistry* synthetic_trial_registry() {
     return &synthetic_trial_registry_;
   }
@@ -186,13 +183,6 @@ class MetricsService : public base::HistogramFlattener {
   bool StageCurrentLogForTest();
 
  protected:
-  // Exposed for testing.
-  // TODO(1034679): migrate these to public FooForTest() methods.
-  MetricsLogManager* log_manager() { return &log_manager_; }
-  MetricsLogStore* log_store() {
-    return reporting_service_.metrics_log_store();
-  }
-
   // Sets the persistent system profile. Virtual for tests.
   virtual void SetPersistentSystemProfile(const std::string& serialized_proto,
                                           bool complete);
@@ -229,6 +219,11 @@ class MetricsService : public base::HistogramFlattener {
     UNSET
   };
 
+  // Gets the LogStore for UMA logs.
+  MetricsLogStore* log_store() {
+    return reporting_service_.metrics_log_store();
+  }
+
   // Calls into the client to initialize some system profile metrics.
   void StartInitTask();
 
@@ -403,6 +398,7 @@ class MetricsService : public base::HistogramFlattener {
   // exited-cleanly bit in the prefs.
   static ShutdownCleanliness clean_shutdown_status_;
 
+  FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, ActiveFieldTrialsReported);
   FRIEND_TEST_ALL_PREFIXES(MetricsServiceTest, IsPluginProcess);
   FRIEND_TEST_ALL_PREFIXES(::ChromeMetricsServiceClientTest,
                            TestRegisterMetricsServiceProviders);