Rename UpdateCheckAction|Params to OmahaRequestAction|Params.
Also, renamed UpdateCheckResponse to OmahaResponse.
BUG=560
TEST=unit tests, gmerge'd on device.
Review URL: http://codereview.chromium.org/2981007
diff --git a/omaha_response_handler_action_unittest.cc b/omaha_response_handler_action_unittest.cc
index b396a9c..489d5e7 100644
--- a/omaha_response_handler_action_unittest.cc
+++ b/omaha_response_handler_action_unittest.cc
@@ -16,7 +16,7 @@
public:
// Return true iff the OmahaResponseHandlerAction succeeded.
// If out is non-NULL, it's set w/ the response from the action.
- bool DoTest(const UpdateCheckResponse& in,
+ bool DoTest(const OmahaResponse& in,
const string& boot_dev,
InstallPlan* out);
};
@@ -51,14 +51,14 @@
"-the_update_a.b.c.d_DELTA_.tgz";
} // namespace {}
-bool OmahaResponseHandlerActionTest::DoTest(const UpdateCheckResponse& in,
+bool OmahaResponseHandlerActionTest::DoTest(const OmahaResponse& in,
const string& boot_dev,
InstallPlan* out) {
ActionProcessor processor;
OmahaResponseHandlerActionProcessorDelegate delegate;
processor.set_delegate(&delegate);
- ObjectFeederAction<UpdateCheckResponse> feeder_action;
+ ObjectFeederAction<OmahaResponse> feeder_action;
feeder_action.set_obj(in);
OmahaResponseHandlerAction response_handler_action;
response_handler_action.set_boot_device(boot_dev);
@@ -79,7 +79,7 @@
TEST_F(OmahaResponseHandlerActionTest, SimpleTest) {
{
- UpdateCheckResponse in;
+ OmahaResponse in;
in.update_exists = true;
in.display_version = "a.b.c.d";
in.codebase = "http://foo/the_update_a.b.c.d.tgz";
@@ -96,7 +96,7 @@
EXPECT_EQ("/dev/sda5", install_plan.install_path);
}
{
- UpdateCheckResponse in;
+ OmahaResponse in;
in.update_exists = true;
in.display_version = "a.b.c.d";
in.codebase = "http://foo/the_update_a.b.c.d.tgz";
@@ -113,7 +113,7 @@
EXPECT_EQ("/dev/sda3", install_plan.install_path);
}
{
- UpdateCheckResponse in;
+ OmahaResponse in;
in.update_exists = true;
in.display_version = "a.b.c.d";
in.codebase = kLongName;
@@ -132,7 +132,7 @@
}
TEST_F(OmahaResponseHandlerActionTest, NoUpdatesTest) {
- UpdateCheckResponse in;
+ OmahaResponse in;
in.update_exists = false;
InstallPlan install_plan;
EXPECT_FALSE(DoTest(in, "/dev/sda1", &install_plan));