commit db0acdfca1ea33987e8b29325f4594417d1fae57
author Jay Srinivasan <jaysri@chromium.org> Tue Apr 02 14:47:45 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Apr 02 16:37:53 2013 -0700
tree 808a05c4a1598d31438d93b96240349902dc662c
parent 670d6803d846250439d42906a23da4c2a21e444c

Support changing from non-canary to canary channel in update engine.

Now that we have added support in lsb-release for both the board appid
and canary app id to be specified, we should use the appropriate appid
according to the channel from which we want to download the new payload.

This change in update engine will enable the change from non-canary to
canary channels. This feature when be lit up end to end when the UI for
this scenario is ready.

BUG=chromium:225866
TEST=Unit tests pass. Tested all channel changes on my ZGB.

Change-Id: Ia9c37c72f53f6c69436f0a96e35d2584d84653c8
Reviewed-on: https://gerrit.chromium.org/gerrit/47181
Commit-Queue: Jay Srinivasan <jaysri@chromium.org>
Reviewed-by: Jay Srinivasan <jaysri@chromium.org>
Tested-by: Jay Srinivasan <jaysri@chromium.org>

omaha_request_params.h

diff --git a/omaha_request_params.h b/omaha_request_params.h
index ada90a8..a3d08ce 100644
--- a/omaha_request_params.h
+++ b/omaha_request_params.h
@@ -33,8 +33,8 @@
       : system_state_(system_state),
         os_platform_(kOsPlatform),
         os_version_(kOsVersion),
-        app_id_(kAppId),
         board_app_id_(kAppId),
+        canary_app_id_(kAppId),
         delta_okay_(true),
         interactive_(false),
         update_disabled_(false),
@@ -68,8 +68,8 @@
         os_version_(in_os_version),
         os_sp_(in_os_sp),
         os_board_(in_os_board),
-        app_id_(in_app_id),
         board_app_id_(in_app_id),
+        canary_app_id_(in_app_id),
         app_version_(in_app_version),
         app_lang_(in_app_lang),
         current_channel_(in_target_channel),
@@ -93,8 +93,8 @@
   inline std::string os_version() const { return os_version_; }
   inline std::string os_sp() const { return os_sp_; }
   inline std::string os_board() const { return os_board_; }
-  inline std::string app_id() const { return app_id_; }
   inline std::string board_app_id() const { return board_app_id_; }
+  inline std::string canary_app_id() const { return canary_app_id_; }
   inline std::string app_lang() const { return app_lang_; }
   inline std::string hwid() const { return hwid_; }
 
@@ -168,6 +168,10 @@
   // i.e. index(target_channel) > index(current_channel).
   bool to_more_stable_channel() const;
 
+  // Returns the app id corresponding to the current value of the
+  // download channel.
+  std::string GetAppId() const;
+
   // Suggested defaults
   static const char* const kAppId;
   static const char* const kOsPlatform;
@@ -265,12 +269,12 @@
   std::string os_sp_;
   std::string os_board_;
 
-  // The app_id identifies the board except when we're on canary-channel.
-  // Whereas the board_app_id always identifies the board irrespective of the
-  // channel we are on. They are required the facilitate the switching from
-  // canary to a non-canary channel.
-  std::string app_id_;
+  // The board app id identifies the app id for the board irrespective of the
+  // channel that we're on. The canary app id identifies the app id to be used
+  // iff we're in the canary-channel. These values could be different depending
+  // on how the release tools are implemented.
   std::string board_app_id_;
+  std::string canary_app_id_;
 
   std::string app_version_;
   std::string app_lang_;