AU: Try delta updates first, then full updates

src/platform/update_engine/omaha_response_handler_action_unittest.cc

 // Copyright (c) 2009 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.
 
 #include <string>
 #include <gtest/gtest.h>
 #include "update_engine/omaha_response_handler_action.h"
 #include "update_engine/test_utils.h"
 #include "update_engine/utils.h"
 
@@ skipping 75 matching lines @@
     in.more_info_url = "http://more/info";
     in.hash = "HASH+";
     in.size = 12;
     in.needs_admin = true;
     in.prompt = false;
     InstallPlan install_plan;
     EXPECT_TRUE(DoTest(in, "/dev/sda1", &install_plan));
     EXPECT_TRUE(install_plan.is_full_update);
     EXPECT_EQ(in.codebase, install_plan.download_url);
     EXPECT_EQ(in.hash, install_plan.download_hash);
-    EXPECT_EQ(utils::kStatefulPartition + "/the_update_a.b.c.d_FULL_.tgz",
+    EXPECT_EQ(string(utils::kStatefulPartition) +
+              "/the_update_a.b.c.d_FULL_.tgz",
               install_plan.download_path);
     EXPECT_EQ("/dev/sda2", install_plan.install_path);
   }
   {
     UpdateCheckResponse in;
     in.update_exists = true;
     in.display_version = "a.b.c.d";
     in.codebase = "http://foo/the_update_a.b.c.d_DELTA_.tgz";
     in.more_info_url = "http://more/info";
     in.hash = "HASHj+";
     in.size = 12;
     in.needs_admin = true;
     in.prompt = true;
     InstallPlan install_plan;
     EXPECT_TRUE(DoTest(in, "/dev/sda4", &install_plan));
     EXPECT_FALSE(install_plan.is_full_update);
     EXPECT_EQ(in.codebase, install_plan.download_url);
     EXPECT_EQ(in.hash, install_plan.download_hash);
-    EXPECT_EQ(utils::kStatefulPartition + "/the_update_a.b.c.d_DELTA_.tgz",
+    EXPECT_EQ(string(utils::kStatefulPartition) +
+              "/the_update_a.b.c.d_DELTA_.tgz",
               install_plan.download_path);
     EXPECT_EQ("/dev/sda3", install_plan.install_path);
   }
   {
     UpdateCheckResponse in;
     in.update_exists = true;
     in.display_version = "a.b.c.d";
     in.codebase = kLongName;
     in.more_info_url = "http://more/info";
     in.hash = "HASHj+";
     in.size = 12;
     in.needs_admin = true;
     in.prompt = true;
     InstallPlan install_plan;
     EXPECT_TRUE(DoTest(in, "/dev/sda4", &install_plan));
     EXPECT_FALSE(install_plan.is_full_update);
     EXPECT_EQ(in.codebase, install_plan.download_url);
     EXPECT_EQ(in.hash, install_plan.download_hash);
-    EXPECT_EQ(utils::kStatefulPartition + "/" + kLongName.substr(0, 255),
+    EXPECT_EQ(string(utils::kStatefulPartition) + "/" +
+              kLongName.substr(0, 255),
               install_plan.download_path);
     EXPECT_EQ("/dev/sda3", install_plan.install_path);
   }
 }
 
 TEST_F(OmahaResponseHandlerActionTest, NoUpdatesTest) {
   UpdateCheckResponse in;
   in.update_exists = false;
   InstallPlan install_plan;
   EXPECT_FALSE(DoTest(in, "/dev/sda1", &install_plan));
   EXPECT_FALSE(install_plan.is_full_update);
   EXPECT_EQ("", install_plan.download_url);
   EXPECT_EQ("", install_plan.download_hash);
   EXPECT_EQ("", install_plan.download_path);
   EXPECT_EQ("", install_plan.install_path);
 }
 
 }  // namespace chromeos_update_engine