Mechanical refactoring of the parser and ActionUpdateCheck

components/update_client/update_response.cc

 // Copyright 2014 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 "components/update_client/update_response.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 240 matching lines @@
     return false;
   }
 
   return true;
 }
 
 // Parses the <updatecheck> tag.
 bool ParseUpdateCheckTag(xmlNode* updatecheck,
                          UpdateResponse::Result* result,
                          std::string* error) {
-  if (GetAttribute(updatecheck, "status") == "noupdate") {
-    return true;
-  }
-
-  // Get the <urls> tag.
-  std::vector<xmlNode*> urls = GetChildren(updatecheck, "urls");
-  if (urls.empty()) {
-    *error = "Missing urls on updatecheck.";
+  // Read the |status| attribute.
+  result->status = GetAttribute(updatecheck, "status");
+  if (result->status.empty()) {
+    *error = "Missing status on updatecheck node";
     return false;
   }
 
-  if (!ParseUrlsTag(urls[0], result, error)) {
-    return false;
+  if (result->status == "noupdate")
+    return true;
+
+  if (result->status == "ok") {
+    std::vector<xmlNode*> urls = GetChildren(updatecheck, "urls");
+    if (urls.empty()) {
+      *error = "Missing urls on updatecheck.";
+      return false;
+    }
+
+    if (!ParseUrlsTag(urls[0], result, error)) {
+      return false;
+    }
+
+    std::vector<xmlNode*> manifests = GetChildren(updatecheck, "manifest");
+    if (manifests.empty()) {
+      *error = "Missing manifest on updatecheck.";
+      return false;
+    }
+
+    return ParseManifestTag(manifests[0], result, error);
   }
 
-  std::vector<xmlNode*> manifests = GetChildren(updatecheck, "manifest");
-  if (manifests.empty()) {
-    *error = "Missing manifest on updatecheck.";
-    return false;
-  }
-
-  return ParseManifestTag(manifests[0], result, error);
+  // Return the |updatecheck| element status as a parsing error.
+  *error = result->status;
+  return false;
 }
 
 // Parses a single <app> tag.
 bool ParseAppTag(xmlNode* app,
                  UpdateResponse::Result* result,
                  std::string* error) {
   // Read cohort information.
   auto cohort = GetAttributePtr(app, "cohort");
   static const char* attrs[] = {UpdateResponse::Result::kCohort,
                                 UpdateResponse::Result::kCohortHint,
@@ skipping 20 matching lines @@
 
   return ParseUpdateCheckTag(updates[0], result, error);
 }
 
 bool UpdateResponse::Parse(const std::string& response_xml) {
   results_.daystart_elapsed_seconds = kNoDaystart;
   results_.daystart_elapsed_days = kNoDaystart;
   results_.list.clear();
   errors_.clear();
 
-  if (response_xml.length() < 1) {
+  if (response_xml.empty()) {
     ParseError("Empty xml");
     return false;
   }
 
   std::string xml_errors;
   ScopedXmlErrorFunc error_func(&xml_errors, &XmlErrorFunc);
 
   // Start up the xml parser with the manifest_xml contents.
   ScopedXmlDocument document(
       xmlParseDoc(reinterpret_cast<const xmlChar*>(response_xml.c_str())));
@@ skipping 47 matching lines @@
       results_.list.push_back(result);
     } else {
       ParseError("%s", error.c_str());
     }
   }
 
   return true;
 }
 
 }  // namespace update_client