Add the dogfood-channel to the list of channels we forward to Omaha.
There is code the checks channel names against an approved list and
hides any that aren't expected. I'm not sure why, but this change
adds the dogfood channel to the list of approved channels.
BUG=chromium-os:28206
TEST=Unittests updated and pass, QA will confirm in the field.
Change-Id: Ic9119d062cde83d00d66e7c9ec3143057033b454
Reviewed-on: https://gerrit.chromium.org/gerrit/18894
Tested-by: Don Garrett <dgarrett@chromium.org>
Reviewed-by: Gilad Arnold <garnold@chromium.org>
Reviewed-by: Andrew de los Reyes <adlr@chromium.org>
Commit-Ready: Don Garrett <dgarrett@chromium.org>
diff --git a/omaha_request_params.cc b/omaha_request_params.cc
index c4dff9d..3733f10 100644
--- a/omaha_request_params.cc
+++ b/omaha_request_params.cc
@@ -180,10 +180,11 @@
bool OmahaRequestDeviceParams::IsValidTrack(const std::string& track) const {
static const char* kValidTracks[] = {
- "canary-channel",
- "stable-channel",
"beta-channel",
+ "canary-channel",
"dev-channel",
+ "dogfood-channel",
+ "stable-channel",
};
if (!ShouldLockDown()) {
return true;
diff --git a/omaha_request_params_unittest.cc b/omaha_request_params_unittest.cc
index d59afcd..090c514 100644
--- a/omaha_request_params_unittest.cc
+++ b/omaha_request_params_unittest.cc
@@ -387,6 +387,7 @@
EXPECT_TRUE(params_.IsValidTrack("stable-channel"));
EXPECT_TRUE(params_.IsValidTrack("beta-channel"));
EXPECT_TRUE(params_.IsValidTrack("dev-channel"));
+ EXPECT_TRUE(params_.IsValidTrack("dogfood-channel"));
EXPECT_FALSE(params_.IsValidTrack("some-channel"));
EXPECT_FALSE(params_.IsValidTrack(""));
params_.SetLockDown(false);
@@ -394,6 +395,7 @@
EXPECT_TRUE(params_.IsValidTrack("stable-channel"));
EXPECT_TRUE(params_.IsValidTrack("beta-channel"));
EXPECT_TRUE(params_.IsValidTrack("dev-channel"));
+ EXPECT_TRUE(params_.IsValidTrack("dogfood-channel"));
EXPECT_TRUE(params_.IsValidTrack("some-channel"));
EXPECT_TRUE(params_.IsValidTrack(""));
}