Consolidate the update_client serialization code.

components/update_client/utils_unittest.cc

 // Copyright 2016 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 "base/files/file_path.h"
-#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "components/update_client/updater_state.h"
 #include "components/update_client/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 using std::string;
 
 namespace {
 
 base::FilePath MakeTestFilePath(const char* file) {
   base::FilePath path;
   PathService::Get(base::DIR_SOURCE_ROOT, &path);
   return path.AppendASCII("components/test/data/update_client")
       .AppendASCII(file);
 }
 
 }  // namespace
 
 namespace update_client {
 
-TEST(UpdateClientUtils, BuildProtocolRequest_ProdIdVersion) {
-  // Verifies that |prod_id| and |version| are serialized.
-  const string request = BuildProtocolRequest("some_prod_id", "1.0", "", "", "",
-                                              "", "", "", nullptr);
-  EXPECT_NE(string::npos, request.find(" version=\"some_prod_id-1.0\" "));
-}
-
-TEST(UpdateClientUtils, BuildProtocolRequest_DownloadPreference) {
-  // Verifies that an empty |download_preference| is not serialized.
-  const string request_no_dlpref =
-      BuildProtocolRequest("", "", "", "", "", "", "", "", nullptr);
-  EXPECT_EQ(string::npos, request_no_dlpref.find(" dlpref="));
-
-  // Verifies that |download_preference| is serialized.
-  const string request_with_dlpref =
-      BuildProtocolRequest("", "", "", "", "", "some pref", "", "", nullptr);
-  EXPECT_NE(string::npos, request_with_dlpref.find(" dlpref=\"some pref\""));
-}
-
-TEST(UpdateClientUtils, BuildProtocolRequest_UpdaterState) {}
-
 TEST(UpdateClientUtils, VerifyFileHash256) {
   EXPECT_TRUE(VerifyFileHash256(
       MakeTestFilePath("jebgalgnebhfojomionfpkfelancnnkf.crx"),
       std::string(
           "6fc4b93fd11134de1300c2c0bb88c12b644a4ec0fd7c9b12cb7cc067667bde87")));
 
   EXPECT_FALSE(VerifyFileHash256(
       MakeTestFilePath("jebgalgnebhfojomionfpkfelancnnkf.crx"),
       std::string("")));
 
@@ skipping 104 matching lines @@
   urls.assign(std::begin(test4), std::end(test4));
   RemoveUnsecureUrls(&urls);
   EXPECT_EQ(0u, urls.size());
 
   const GURL test5[] = {GURL("http://foo"), GURL("http://bar")};
   urls.assign(std::begin(test5), std::end(test5));
   RemoveUnsecureUrls(&urls);
   EXPECT_EQ(0u, urls.size());
 }
 
-TEST(UpdateClientUtils, BuildProtocolRequestUpdaterStateAttributes) {
-  // When no updater state is provided, then check that the elements and
-  // attributes related to the updater state are not serialized.
-  std::string request =
-      BuildProtocolRequest("", "", "", "", "", "", "", "", nullptr).c_str();
-  EXPECT_EQ(std::string::npos, request.find(" domainjoined"));
-  EXPECT_EQ(std::string::npos, request.find("<updater"));
-
-  UpdaterState::Attributes attributes;
-  attributes["domainjoined"] = "1";
-  attributes["name"] = "Omaha";
-  attributes["version"] = "1.2.3.4";
-  attributes["laststarted"] = "1";
-  attributes["lastchecked"] = "2";
-  attributes["autoupdatecheckenabled"] = "0";
-  attributes["updatepolicy"] = "-1";
-  request = BuildProtocolRequest(
-      "", "", "", "", "", "", "", "",
-      base::MakeUnique<UpdaterState::Attributes>(attributes));
-  EXPECT_NE(std::string::npos, request.find(" domainjoined=\"1\""));
-  const std::string updater_element =
-      "<updater autoupdatecheckenabled=\"0\" "
-      "lastchecked=\"2\" laststarted=\"1\" name=\"Omaha\" "
-      "updatepolicy=\"-1\" version=\"1.2.3.4\"/>";
-#if defined(GOOGLE_CHROME_BUILD)
-  EXPECT_NE(std::string::npos, request.find(updater_element));
-#else
-  EXPECT_EQ(std::string::npos, request.find(updater_element));
-#endif  // GOOGLE_CHROME_BUILD
-}
-
 }  // namespace update_client