Revert of Support different Google attestation (Privacy CA) servers.

chrome/browser/chromeos/attestation/attestation_ca_client.cc

Index: chrome/browser/chromeos/attestation/attestation_ca_client.cc
diff --git a/chrome/browser/chromeos/attestation/attestation_ca_client.cc b/chrome/browser/chromeos/attestation/attestation_ca_client.cc
index 66db47f511602725a50d73165e834af9fc3c0bb1..d97b3cc8d4989d021242f9280e73adee80875c20 100644
--- a/chrome/browser/chromeos/attestation/attestation_ca_client.cc
+++ b/chrome/browser/chromeos/attestation/attestation_ca_client.cc
@@ -6,9 +6,7 @@
 
 #include <string>
 
-#include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
-#include "chromeos/chromeos_switches.h"
 #include "net/base/load_flags.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
@@ -16,22 +14,9 @@
 #include "url/gurl.h"
 
 namespace {
-// Values for the attestation server switch.
-const char kAttestationServerDefault[] = "default";
-const char kAttestationServerTest[] = "test";
 
-// Endpoints for the default Google Privacy CA operations.
-const char kDefaultEnrollRequestURL[] =
-    "https://chromeos-ca.gstatic.com/enroll";
-const char kDefaultCertificateRequestURL[] =
-    "https://chromeos-ca.gstatic.com/sign";
-
-// Endpoints for the test Google Privacy CA operations.
-const char kTestEnrollRequestURL[] =
-    "https://asbestos-qa.corp.google.com/enroll";
-const char kTestCertificateRequestURL[] =
-    "https://asbestos-qa.corp.google.com/sign";
-
+const char kCertificateRequestURL[] = "https://chromeos-ca.gstatic.com/sign";
+const char kEnrollRequestURL[] = "https://chromeos-ca.gstatic.com/enroll";
 const char kMimeContentType[] = "application/octet-stream";
 
 }  // namespace
@@ -39,40 +24,19 @@
 namespace chromeos {
 namespace attestation {
 
-static PrivacyCAType GetAttestationServerType() {
-  std::string value =
-      base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-          chromeos::switches::kAttestationServer);
-  if (value.empty() || value == kAttestationServerDefault) {
-    return DEFAULT_PCA;
-  }
-  if (value == kAttestationServerTest) {
-    return TEST_PCA;
-  }
-  LOG(WARNING) << "Invalid attestation server value: " << value
-               << ". Using default.";
-  return DEFAULT_PCA;
-}
-
-AttestationCAClient::AttestationCAClient() {
-  pca_type_ = GetAttestationServerType();
-}
+AttestationCAClient::AttestationCAClient() {}
 
 AttestationCAClient::~AttestationCAClient() {}
 
 void AttestationCAClient::SendEnrollRequest(const std::string& request,
                                             const DataCallback& on_response) {
-  FetchURL(
-      GetType() == TEST_PCA ? kTestEnrollRequestURL : kDefaultEnrollRequestURL,
-      request, on_response);
+  FetchURL(kEnrollRequestURL, request, on_response);
 }
 
 void AttestationCAClient::SendCertificateRequest(
     const std::string& request,
     const DataCallback& on_response) {
-  FetchURL(GetType() == TEST_PCA ? kTestCertificateRequestURL
-                                 : kDefaultCertificateRequestURL,
-           request, on_response);
+  FetchURL(kCertificateRequestURL, request, on_response);
 }
 
 void AttestationCAClient::OnURLFetchComplete(const net::URLFetcher* source) {
@@ -125,9 +89,5 @@
   fetcher->Start();
 }
 
-PrivacyCAType AttestationCAClient::GetType() {
-  return pca_type_;
-}
-
 }  // namespace attestation
 }  // namespace chromeos