Remove UMAInitialMetricsTiming Trial

components/metrics/metrics_service.cc

 // Copyright 2014 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.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It is
@@ skipping 230 matching lines @@
       return NO_RESPONSE;
     case 200:
       return SUCCESS;
     case 400:
       return BAD_REQUEST;
     default:
       return UNKNOWN_FAILURE;
   }
 }
 
-bool NewInitialMetricsTimingEnabled() {
-  return base::FieldTrialList::FindFullName("UMAInitialMetricsTiming") ==
-      "Enabled";
-}
-
 void MarkAppCleanShutdownAndCommit(CleanExitBeacon* clean_exit_beacon,
                                    PrefService* local_state) {
   clean_exit_beacon->WriteBeaconValue(true);
   local_state->SetInteger(prefs::kStabilityExecutionPhase,
                           MetricsService::SHUTDOWN_COMPLETE);
   // Start writing right away (write happens on a different thread).
   local_state->CommitPendingWrite();
 }
 
 }  // namespace
@@ skipping 616 matching lines @@
   if (log_manager_.has_staged_log())
     return;
 
   switch (state_) {
     case INITIALIZED:
     case INIT_TASK_SCHEDULED:  // We should be further along by now.
       NOTREACHED();
       return;
 
     case INIT_TASK_DONE:
-      if (NewInitialMetricsTimingEnabled()) {
-        PrepareInitialMetricsLog();
-        // Stage the first log, which could be a stability log (either one
-        // for created in this session or from a previous session) or the
-        // initial metrics log that was just created.
-        log_manager_.StageNextLogForUpload();
-        if (has_initial_stability_log_) {
-          // The initial stability log was just staged.
-          has_initial_stability_log_ = false;
-          state_ = SENDING_INITIAL_STABILITY_LOG;
-        } else {
-          state_ = SENDING_INITIAL_METRICS_LOG;
-        }
+      PrepareInitialMetricsLog();
+      // Stage the first log, which could be a stability log (either one
+      // for created in this session or from a previous session) or the
+      // initial metrics log that was just created.
+      log_manager_.StageNextLogForUpload();
+      if (has_initial_stability_log_) {
+        // The initial stability log was just staged.
+        has_initial_stability_log_ = false;
+        state_ = SENDING_INITIAL_STABILITY_LOG;
       } else {
-        if (has_initial_stability_log_) {
-          // There's an initial stability log, ready to send.
-          log_manager_.StageNextLogForUpload();
-          has_initial_stability_log_ = false;
-          state_ = SENDING_INITIAL_STABILITY_LOG;
-        } else {
-          PrepareInitialMetricsLog();
-          log_manager_.StageNextLogForUpload();
-          state_ = SENDING_INITIAL_METRICS_LOG;
-        }
+        state_ = SENDING_INITIAL_METRICS_LOG;
       }
       break;
 
     case SENDING_OLD_LOGS:
       NOTREACHED();  // Shouldn't be staging a new log during old log sending.
       return;
 
     case SENDING_CURRENT_LOGS:
       CloseCurrentLog();
       OpenNewLog();
@@ skipping 114 matching lines @@
 
 void MetricsService::OnLogUploadComplete(int response_code) {
   DCHECK(log_upload_in_progress_);
   log_upload_in_progress_ = false;
 
   // Log a histogram to track response success vs. failure rates.
   UMA_HISTOGRAM_ENUMERATION("UMA.UploadResponseStatus.Protobuf",
                             ResponseCodeToStatus(response_code),
                             NUM_RESPONSE_STATUSES);
 
-  bool suppress_reschedule = false;
-
   bool upload_succeeded = response_code == 200;
 
   // Provide boolean for error recovery (allow us to ignore response_code).
   bool discard_log = false;
   const size_t log_size = log_manager_.staged_log().length();
   if (upload_succeeded) {
     UMA_HISTOGRAM_COUNTS_10000("UMA.LogSize.OnSuccess", log_size / 1024);
   } else if (log_size > kUploadLogAvoidRetransmitSize) {
     UMA_HISTOGRAM_COUNTS("UMA.Large Rejected Log was Discarded",
                          static_cast<int>(log_size));
     discard_log = true;
   } else if (response_code == 400) {
     // Bad syntax.  Retransmission won't work.
     discard_log = true;
   }
 
   if (upload_succeeded || discard_log) {
     log_manager_.DiscardStagedLog();
     // Store the updated list to disk now that the removed log is uploaded.
     log_manager_.PersistUnsentLogs();
   }
 
   if (!log_manager_.has_staged_log()) {
     switch (state_) {
       case SENDING_INITIAL_STABILITY_LOG:
-        if (NewInitialMetricsTimingEnabled()) {
-          // The initial metrics log is already in the queue of unsent logs.
-          state_ = SENDING_OLD_LOGS;
-        } else {
-          PrepareInitialMetricsLog();
-          log_manager_.StageNextLogForUpload();
-          SendStagedLog();
-          state_ = SENDING_INITIAL_METRICS_LOG;
-          suppress_reschedule = true;
-        }
+        // The initial metrics log is already in the queue of unsent logs.
+        state_ = SENDING_OLD_LOGS;
         break;
 
       case SENDING_INITIAL_METRICS_LOG:
         state_ = log_manager_.has_unsent_logs() ? SENDING_OLD_LOGS
                                                 : SENDING_CURRENT_LOGS;
         break;
 
       case SENDING_OLD_LOGS:
         if (!log_manager_.has_unsent_logs())
           state_ = SENDING_CURRENT_LOGS;
         break;
 
       case SENDING_CURRENT_LOGS:
         break;
 
       default:
         NOTREACHED();
         break;
     }
 
     if (log_manager_.has_unsent_logs())
       DCHECK_LT(state_, SENDING_CURRENT_LOGS);
   }
 
   // Error 400 indicates a problem with the log, not with the server, so
   // don't consider that a sign that the server is in trouble.
   bool server_is_healthy = upload_succeeded || response_code == 400;
-  // Don't notify the scheduler that the upload is finished if we've only just
-  // sent the initial stability log, but not yet the initial metrics log (treat
-  // the two as a single unit of work as far as the scheduler is concerned).
-  if (!suppress_reschedule) {
-    scheduler_->UploadFinished(server_is_healthy,
-                               log_manager_.has_unsent_logs());
-  }
+  scheduler_->UploadFinished(server_is_healthy, log_manager_.has_unsent_logs());
 
   if (server_is_healthy)
     client_->OnLogUploadComplete();
 }
 
 void MetricsService::IncrementPrefValue(const char* path) {
   int value = local_state_->GetInteger(path);
   local_state_->SetInteger(path, value + 1);
 }
 
@@ skipping 127 matching lines @@
                  base::Time::Now().ToTimeT());
 }
 
 void MetricsService::SetConnectionTypeCallback(
     base::Callback<void(bool*)> is_cellular_callback) {
   DCHECK(!scheduler_);
   is_cellular_callback_ = is_cellular_callback;
 }
 
 }  // namespace metrics