Fixed channel switch when user decides to switch to another channel in

chrome/browser/ui/webui/help/version_updater_chromeos.h

Index: chrome/browser/ui/webui/help/version_updater_chromeos.h
diff --git a/chrome/browser/ui/webui/help/version_updater_chromeos.h b/chrome/browser/ui/webui/help/version_updater_chromeos.h
index bfdee79df091d2ee082631bfd251bbf22c2a8099..aef2c3976b6a53c7b11f41de8da1355f509fb1fb 100644
--- a/chrome/browser/ui/webui/help/version_updater_chromeos.h
+++ b/chrome/browser/ui/webui/help/version_updater_chromeos.h
@@ -24,6 +24,10 @@ class VersionUpdaterCros : public VersionUpdater,
   // Gets the last update status, without triggering a new check or download.
   void GetUpdateStatus(const StatusCallback& callback);
 
+  void set_can_update_for_testing(bool can_update_for_testing) {
+    can_update_for_testing_ = can_update_for_testing;
+  }
+
  protected:
   friend class VersionUpdater;
 
@@ -39,12 +43,23 @@ class VersionUpdaterCros : public VersionUpdater,
   // Callback from UpdateEngineClient::RequestUpdateCheck().
   void OnUpdateCheck(chromeos::UpdateEngineClient::UpdateCheckResult result);
 
+  // Returns whether an update is allowed. If not, it calls the callback with
+  // the appropriate status.
+  bool EnsureCanUpdate(const StatusCallback& callback);
+
   // Callback used to communicate update status to the client.
   StatusCallback callback_;
 
   // Last state received via UpdateStatusChanged().
   chromeos::UpdateEngineClient::UpdateStatusOperation last_operation_;
 
+  // True if an update check was scheduled when update engine'll move to an idle
+  // state.
+  bool check_for_update_when_idle_;
+
+  // True if an update check can be performed in tests.
+  bool can_update_for_testing_;

[James Hawkins, 2014/09/18 15:48:22]

Why is this necessary?

[ygorshenin1, 2014/09/18 15:59:07]

To simplify testing and omit unnecessary checks in unit tests. For instance,
before call to UpdateEngineClient::RequestUpdateCheck() VersionUpdaterCros
checks that the device is registered and we're currently not on the OOBE screen,
etc. Of course, instead of boolean flag we can check that command line has
kTestType switch. What do you think?

On 2014/09/18 15:48:22, James Hawkins wrote:

+
   base::WeakPtrFactory<VersionUpdaterCros> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VersionUpdaterCros);