AU: Include a bit flag (bit 31) in error codes to indicate non-normal boot mode.

omaha_request_action_unittest.cc

 // Copyright (c) 2010 The Chromium OS 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 <vector>
 
 #include <glib.h>
 
 #include "base/string_util.h"
@@ skipping 585 matching lines @@
                            kActionCodeError),
             "invalid xml>",
             &post_data);
   // convert post_data to string
   string post_str(&post_data[0], post_data.size());
   string expected_event = StringPrintf(
       "        <o:event eventtype=\"%d\" eventresult=\"%d\" "
       "errorcode=\"%d\"></o:event>\n",
       OmahaEvent::kTypeDownloadComplete,
       OmahaEvent::kResultError,
-      kActionCodeError);
+      kActionCodeError | kActionCodeBootModeFlag);
   EXPECT_NE(post_str.find(expected_event), string::npos);
   EXPECT_EQ(post_str.find("o:updatecheck"), string::npos);
 }
-
-TEST(OmahaRequestActionTest, FormatEventOutputTest) {
-  vector<char> post_data;
-  TestEvent(kDefaultTestParams,
-            new OmahaEvent(OmahaEvent::kTypeDownloadComplete,
-                           OmahaEvent::kResultError,
-                           kActionCodeError),
-            "invalid xml>",
-            &post_data);
-  // convert post_data to string
-  string post_str(&post_data[0], post_data.size());
-  string expected_event = StringPrintf(
-      "        <o:event eventtype=\"%d\" eventresult=\"%d\" "
-      "errorcode=\"%d\"></o:event>\n",
-      OmahaEvent::kTypeDownloadComplete,
-      OmahaEvent::kResultError,
-      kActionCodeError);
-  EXPECT_NE(post_str.find(expected_event), string::npos);
-  EXPECT_EQ(post_str.find("o:updatecheck"), string::npos);
-}
 
 TEST(OmahaRequestActionTest, IsEventTest) {
   string http_response("doesn't matter");
   NiceMock<PrefsMock> prefs;
   OmahaRequestAction update_check_action(
       &prefs,
       kDefaultTestParams,
       NULL,
       new MockHttpFetcher(http_response.data(),
                           http_response.size(),
@@ skipping 283 matching lines @@
                       "",
                       1500,
                       static_cast<ActionExitCode>(
                           kActionCodeOmahaRequestHTTPResponseBase + 999),
                       &response,
                       NULL));
   EXPECT_FALSE(response.update_exists);
 }
 
 }  // namespace chromeos_update_engine