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

chrome/browser/chromeos/login/screens/error_screen.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 23 matching lines @@
     UI_STATE_AUTO_ENROLLMENT_ERROR,
     UI_STATE_ROLLBACK_ERROR,
   };
 
   enum ErrorState {
     ERROR_STATE_UNKNOWN = 0,
     ERROR_STATE_PORTAL,
     ERROR_STATE_OFFLINE,
     ERROR_STATE_PROXY,
     ERROR_STATE_AUTH_EXT_TIMEOUT,
-    ERROR_STATE_NONE,
-    // States above are being logged to histograms.
-    // Please keep ERROR_STATE_NONE as the last one of the histogram values.
-    ERROR_STATE_KIOSK_ONLINE,
+    ERROR_STATE_KIOSK_ONLINE
   };
 
   ErrorScreen(ScreenObserver* screen_observer, ErrorScreenActor* actor);
   virtual ~ErrorScreen();
 
   // WizardScreen implementation.
   virtual void PrepareToShow() OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void Hide() OVERRIDE;
   virtual std::string GetName() const OVERRIDE;
@@ skipping 24 matching lines @@
 
   // Sets current UI state.
   void SetUIState(UIState ui_state);
 
   UIState GetUIState() const;
 
   // Sets current error screen content according to current UI state,
   // |error_state|, and |network|.
   void SetErrorState(ErrorState error_state, const std::string& network);
 
-  ErrorState GetErrorState() const;
-
   // Toggles the guest sign-in prompt.
   void AllowGuestSignin(bool allow);
 
   // Toggles the connection pending indicator.
   void ShowConnectingIndicator(bool show);
 
   void set_parent_screen(OobeDisplay::Screen parent_screen) {
     parent_screen_ = parent_screen;
   }
   OobeDisplay::Screen parent_screen() const { return parent_screen_; }
@@ skipping 13 matching lines @@
   scoped_ptr<LoginPerformer> guest_login_performer_;
 
   base::WeakPtrFactory<ErrorScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ErrorScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_ERROR_SCREEN_H_