Fix profile resetter Omaha request:

chrome/browser/profile_resetter/brandcode_config_fetcher.cc

 // Copyright 2013 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 "chrome/browser/profile_resetter/brandcode_config_fetcher.h"
 
 #include <stddef.h>
+#include <string>

[engedy, 2017/06/03 08:02:49]

nit: Looks like <string> should already be included in the corresponding header.
Could you please move this include there? 

[waffles, 2017/06/07 17:23:13]

Done.

+#include <vector>
 
 #include "base/callback_helpers.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profile_resetter/brandcoded_default_settings.h"
 #include "libxml/parser.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_response_headers.h"
 #include "net/traffic_annotation/network_traffic_annotation.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 const int kDownloadTimeoutSec = 10;
 const char kPostXml[] =
-"<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
-"<request version=\"1.3.17.0\" protocol=\"3.0\" testsource=\"dev\" "
-    "shell_version=\"1.2.3.5\">\n"
-"  <os platform=\"win\" version=\"6.1\" sp=\"\" arch=\"x86\" />\n"
-"  <app\n"
-"    appid=\"{8A69D345-D564-463C-AFF1-A69D9E530F96}\"\n"
-"    version=\"0.0.0.0\"\n"
-"      >\n"
-"    <data name=\"install\" "
-    "index=\"__BRANDCODE_PLACEHOLDER__\" />\n"
-"  </app>\n"
-"</request>";
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
+    "<request"
+    "    version=\"chromeprofilereset-1.1\""
+    "    protocol=\"3.0\""
+    "    installsource=\"profilereset\">"
+    "  <app appid=\"{8A69D345-D564-463C-AFF1-A69D9E530F96}\">"
+    "    <data name=\"install\" index=\"__BRANDCODE_PLACEHOLDER__\"/>"
+    "  </app>"
+    "</request>";
 
 // Returns the query to the server which can be used to retrieve the config.
 // |brand| is a brand code, it mustn't be empty.
 std::string GetUploadData(const std::string& brand) {
   DCHECK(!brand.empty());
   std::string data(kPostXml);
   const std::string placeholder("__BRANDCODE_PLACEHOLDER__");
   size_t placeholder_pos = data.find(placeholder);
   DCHECK(placeholder_pos != std::string::npos);
   data.replace(placeholder_pos, placeholder.size(), brand);
@@ skipping 85 matching lines @@
         std::string(reinterpret_cast<const char*>(ch), len);
   }
 }
 
 bool XmlConfigParser::IsParsingData() const {
   const std::string data_path[] = {"response", "app", "data"};
   return elements_.size() == arraysize(data_path) &&
          std::equal(elements_.begin(), elements_.end(), data_path);
 }
 
-} // namespace
+}  // namespace
 
 BrandcodeConfigFetcher::BrandcodeConfigFetcher(const FetchCallback& callback,
                                                const GURL& url,
                                                const std::string& brandcode)
     : fetch_callback_(callback) {
   DCHECK(!brandcode.empty());
   net::NetworkTrafficAnnotationTag traffic_annotation =
       net::DefineNetworkTrafficAnnotation("brandcode_config", R"(
         semantics {
           sender: "Brandcode Configuration Fetcher"
@@ skipping 60 matching lines @@
   download_timer_.Stop();
   base::ResetAndReturn(&fetch_callback_).Run();
 }
 
 void BrandcodeConfigFetcher::OnDownloadTimeout() {
   if (config_fetcher_) {
     config_fetcher_.reset();
     base::ResetAndReturn(&fetch_callback_).Run();
   }
 }