Revert of Make Hands-Off Zero-Touch Enrollment compatibile with tests

chrome/browser/chromeos/login/screens/update_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_UPDATE_SCREEN_H_
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_
 
 #include <set>
 
 #include "base/callback.h"
@@ skipping 61 matching lines @@
 
   // Skip update UI, usually used only in debug builds/tests.
   void CancelUpdate();
 
   base::OneShotTimer& GetErrorMessageTimerForTesting();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestBasic);
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestUpdateAvailable);
   FRIEND_TEST_ALL_PREFIXES(UpdateScreenTest, TestAPReselection);
-  friend class UpdateScreenUnitTest;
 
   enum class State {
     STATE_IDLE = 0,
     STATE_FIRST_PORTAL_CHECK,
     STATE_UPDATE,
     STATE_ERROR
   };
 
   // BaseScreen:
   void Show() override;
@@ skipping 26 matching lines @@
   void HideErrorMessage();
   void UpdateErrorMessage(
       const NetworkState* network,
       const NetworkPortalDetector::CaptivePortalStatus status);
 
   void DelayErrorMessage();
 
   // The user requested an attempt to connect to the network should be made.
   void OnConnectRequested();
 
-  // Records the fact that we performed an update check but do not yet
-  // know if this update check is going to result in an update.
-  void RecordUpdateCheckWithNoUpdateYet();
-
-  // When an update is found, this is called to clear the time of update check
-  // which had saved when we did not yet know whether it would result in an
-  // update.
-  void ClearUpdateCheckNoUpdateTime();
-
-  // Returns true if we should check for an update.
-  bool ShouldCheckForUpdate();
-
   // Timer for the interval to wait for the reboot.
   // If reboot didn't happen - ask user to reboot manually.
   base::OneShotTimer reboot_timer_;
 
   // Returns a static InstanceSet.
   // TODO(jdufault): There should only ever be one instance of this class.
   // Remove support for supporting multiple instances. See crbug.com/672142.
   typedef std::set<UpdateScreen*> InstanceSet;
   static InstanceSet& GetInstanceSet();
 
@@ skipping 51 matching lines @@
   ErrorScreen::ConnectRequestCallbackSubscription connect_request_subscription_;
 
   base::WeakPtrFactory<UpdateScreen> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UpdateScreen);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_LOGIN_SCREENS_UPDATE_SCREEN_H_