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

chrome/browser/ui/webui/help/version_updater_chromeos.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_UI_WEBUI_HELP_VERSION_UPDATER_CHROMEOS_H_
 #define CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_CHROMEOS_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/ui/webui/help/version_updater.h"
 #include "chromeos/dbus/update_engine_client.h"
 
 class VersionUpdaterCros : public VersionUpdater,
                            public chromeos::UpdateEngineClient::Observer {
  public:
   // VersionUpdater implementation.
   virtual void CheckForUpdate(const StatusCallback& callback) OVERRIDE;
   virtual void RelaunchBrowser() const OVERRIDE;
   virtual void SetChannel(const std::string& channel,
                           bool is_powerwash_allowed) OVERRIDE;
   virtual void GetChannel(bool get_current_channel,
                           const ChannelCallback& callback) OVERRIDE;
 
   // 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;
 
   // Clients must use VersionUpdater::Create().
   VersionUpdaterCros();
   virtual ~VersionUpdaterCros();
 
  private:
   // UpdateEngineClient::Observer implementation.
   virtual void UpdateStatusChanged(
       const chromeos::UpdateEngineClient::Status& status) OVERRIDE;
 
   // 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 should be scheduled when the update engine will

[James Hawkins, 2014/09/22 16:48:31]

Optional nit: This is easier to grok for me if you use the phrasing, "when the
update engine is idle."

[ygorshenin1, 2014/09/22 19:01:54]

Done.

+  // be idle.
+  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/22 16:48:31]

I took a high-level look at what you're trying to accomplish, and I think,
barring other design changes, the most appropriate thing for you to do is to use
object mocking to mock out the CanUpdate method to return true under test.

A better design would be to create an interface with a method on it that
performs this check.  Then you'd implement the real implementation in the
version_updater_chromeos.cc file and have a test implementation in the
_unittest.cc file.

[ygorshenin1, 2014/09/22 19:01:54]

I've made a virtual EnsureCanUpdate() method and overridden it in the test code.

On 2014/09/22 16:48:31, James Hawkins wrote:

+
   base::WeakPtrFactory<VersionUpdaterCros> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(VersionUpdaterCros);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_HELP_VERSION_UPDATER_CHROMEOS_H_