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

chrome/browser/ui/webui/chromeos/login/enrollment_screen_handler.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/ui/webui/chromeos/login/enrollment_screen_handler.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_remover.h"
-#include "chrome/browser/chromeos/login/error_screens_histogram_helper.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/policy/policy_oauth2_token_fetcher.h"
 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/chromeos/login/authenticated_user_email_retriever.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/grit/generated_resources.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "components/policy/core/browser/cloud/message_util.h"
@@ skipping 79 matching lines @@
     const scoped_refptr<NetworkStateInformer>& network_state_informer,
     ErrorScreenActor* error_screen_actor)
     : BaseScreenHandler(kJsScreenPath),
       controller_(NULL),
       show_on_init_(false),
       enrollment_mode_(ENROLLMENT_MODE_MANUAL),
       browsing_data_remover_(NULL),
       frame_error_(net::OK),
       network_state_informer_(network_state_informer),
       error_screen_actor_(error_screen_actor),
-      histogram_helper_(new ErrorScreensHistogramHelper("Enrollment")),
       weak_ptr_factory_(this) {
   set_async_assets_load_id(OobeUI::kScreenOobeEnrollment);
   DCHECK(network_state_informer_.get());
   DCHECK(error_screen_actor_);
   network_state_informer_->AddObserver(this);
 
   if (chromeos::LoginDisplayHostImpl::default_host()) {
     chromeos::WebUILoginView* login_view =
         chromeos::LoginDisplayHostImpl::default_host()->GetWebUILoginView();
     if (login_view)
@@ skipping 360 matching lines @@
 
   if (GetCurrentScreen() != OobeUI::SCREEN_ERROR_MESSAGE) {
     base::DictionaryValue params;
     const std::string network_type = network_state_informer_->network_type();
     params.SetString("lastNetworkType", network_type);
     error_screen_actor_->SetUIState(ErrorScreen::UI_STATE_SIGNIN);
     error_screen_actor_->Show(OobeUI::SCREEN_OOBE_ENROLLMENT,
                               &params,
                               base::Bind(&EnrollmentScreenHandler::DoShow,
                                          weak_ptr_factory_.GetWeakPtr()));
-    histogram_helper_->OnErrorShow(error_screen_actor_->error_state());
   }
 }
 
 void EnrollmentScreenHandler::HideOfflineMessage(
     NetworkStateInformer::State state,
     ErrorScreenActor::ErrorReason reason) {
   if (IsEnrollmentScreenHiddenByError())
     error_screen_actor_->Hide();
-  histogram_helper_->OnErrorHide();
 }
 
 void EnrollmentScreenHandler::OnFrameError(
     const std::string& frame_unique_name) {
   if (frame_unique_name == "oauth-enroll-signin-frame") {
     HandleFrameLoadingCompleted(net::ERR_FAILED);
   }
 }
 // EnrollmentScreenHandler, private -----------------------------
 
@@ skipping 73 matching lines @@
   base::DictionaryValue screen_data;
   screen_data.SetString(
       "signin_url",
       base::StringPrintf("%s/main.html", extensions::kGaiaAuthExtensionOrigin));
   screen_data.SetString("gaiaUrl", GaiaUrls::GetInstance()->gaia_url().spec());
   screen_data.SetString("enrollment_mode",
                         EnrollmentModeToString(enrollment_mode_));
   screen_data.SetString("management_domain", management_domain_);
 
   ShowScreen(OobeUI::kScreenOobeEnrollment, &screen_data);
-  histogram_helper_->OnScreenShow();
 }
 
 }  // namespace chromeos