Revert "UMA: How often are different network error screens encountered during OOBE"

chrome/browser/chromeos/login/screens/update_screen.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/chromeos/login/screens/update_screen.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/threading/thread_restrictions.h"
-#include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
 #include "chrome/browser/chromeos/login/screen_manager.h"
 #include "chrome/browser/chromeos/login/screens/error_screen.h"
 #include "chrome/browser/chromeos/login/screens/screen_observer.h"
 #include "chrome/browser/chromeos/login/screens/update_screen_actor.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_state.h"
 #include "content/public/browser/browser_thread.h"
 
@@ skipping 60 matching lines @@
   InstanceSet::iterator found = instance_set.find(inst);
   return (found != instance_set.end());
 }
 
 // static
 UpdateScreen* UpdateScreen::Get(ScreenManager* manager) {
   return static_cast<UpdateScreen*>(
       manager->GetScreen(WizardController::kUpdateScreenName));
 }
 
-UpdateScreen::UpdateScreen(ScreenObserver* screen_observer,
-                           UpdateScreenActor* actor)
+UpdateScreen::UpdateScreen(
+    ScreenObserver* screen_observer,
+    UpdateScreenActor* actor)
     : WizardScreen(screen_observer),
       state_(STATE_IDLE),
       reboot_check_delay_(0),
       is_checking_for_update_(true),
       is_downloading_update_(false),
       is_ignore_update_deadlines_(false),
       is_shown_(false),
       ignore_idle_status_(true),
       actor_(actor),
       is_first_detection_notification_(true),
       is_first_portal_notification_(true),
-      histogram_helper_(new ErrorScreensHistogramHelper("Update")),
       weak_factory_(this) {
   DCHECK(actor_);
   if (actor_)
     actor_->SetDelegate(this);
   GetInstanceSet().insert(this);
 }
 
 UpdateScreen::~UpdateScreen() {
   DBusThreadManager::Get()->GetUpdateEngineClient()->RemoveObserver(this);
   NetworkPortalDetector::Get()->RemoveObserver(this);
@@ skipping 172 matching lines @@
   NetworkPortalDetector::Get()->AddAndFireObserver(this);
 }
 
 void UpdateScreen::CancelUpdate() {
   VLOG(1) << "Forced update cancel";
   ExitUpdate(REASON_UPDATE_CANCELED);
 }
 
 void UpdateScreen::Show() {
   is_shown_ = true;
-  histogram_helper_->OnScreenShow();
   if (actor_) {
     actor_->Show();
     actor_->SetProgress(kBeforeUpdateCheckProgress);
   }
 }
 
 void UpdateScreen::Hide() {
   if (actor_)
     actor_->Hide();
   is_shown_ = false;
@@ skipping 171 matching lines @@
   VLOG(1) << "Initiate update check";
   DBusThreadManager::Get()->GetUpdateEngineClient()->RequestUpdateCheck(
       base::Bind(StartUpdateCallback, this));
 }
 
 void UpdateScreen::ShowErrorMessage() {
   LOG(WARNING) << "UpdateScreen::ShowErrorMessage()";
   state_ = STATE_ERROR;
   GetErrorScreen()->SetUIState(ErrorScreen::UI_STATE_UPDATE);
   get_screen_observer()->ShowErrorScreen();
-  histogram_helper_->OnErrorShow(GetErrorScreen()->GetErrorState());
 }
 
 void UpdateScreen::HideErrorMessage() {
   LOG(WARNING) << "UpdateScreen::HideErrorMessage()";
   get_screen_observer()->HideErrorScreen(this);
-  histogram_helper_->OnErrorHide();
 }
 
 void UpdateScreen::UpdateErrorMessage(
     const NetworkState* network,
     const NetworkPortalDetector::CaptivePortalStatus status) {
   switch (status) {
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE:
       NOTREACHED();
       break;
     case NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_UNKNOWN:
@@ skipping 14 matching lines @@
       GetErrorScreen()->SetErrorState(ErrorScreen::ERROR_STATE_PROXY,
                                       std::string());
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 }  // namespace chromeos