Revert "deploy AttestationFlowIntegrated"

This reverts commit 6d81ed25.

Reason for revert: the project dependency, platform-side proxy, is
currently only enabled with device policy and not universally available
until M88.


Original change's description:
> deploy AttestationFlowIntegrated
>
> This CL deploys the usage of platform side of attestation flow because
> attestation service at platform side knows better about the stat
> machines of the enrollment.
>
> BUG=b:158955123
>
> Change-Id: I902f8bfc43da9cb2cae0e65a0d244c31ce986dfa
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297061
> Commit-Queue: Leo Lai <cylai@google.com>
> Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#789858}

TBR=emaxx@chromium.org,cylai@google.com

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: b:158955123
Change-Id: I429984e8ef2f7c0e3b52d829fa9c4abc8cbc47fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2423700
Commit-Queue: Leo Lai <cylai@google.com>
Reviewed-by: Pavol Marko <pmarko@chromium.org>
Reviewed-by: Andreea-Elena Costinas <acostinas@google.com>
Reviewed-by: Maksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#810254}

chrome/browser/chromeos/attestation/enrollment_certificate_uploader_impl.cc

@@ -11,7 +11,6 @@
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
 #include "chromeos/attestation/attestation_flow.h"
-#include "chromeos/attestation/attestation_flow_integrated.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome/cryptohome_client.h"
@@ -95,7 +94,11 @@ void EnrollmentCertificateUploaderImpl::Start() {
     cryptohome_client_ = CryptohomeClient::Get();
 
   if (!attestation_flow_) {
-    default_attestation_flow_ = std::make_unique<AttestationFlowIntegrated>();
+    std::unique_ptr<ServerProxy> attestation_ca_client(
+        new AttestationCAClient());
+    default_attestation_flow_.reset(new AttestationFlow(
+        cryptohome::AsyncMethodCaller::GetInstance(), cryptohome_client_,
+        std::move(attestation_ca_client)));
     attestation_flow_ = default_attestation_flow_.get();
   }
 

chrome/browser/chromeos/attestation/machine_certificate_uploader_impl.cc

@@ -17,7 +17,6 @@
 #include "chrome/browser/chromeos/attestation/attestation_key_payload.pb.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chromeos/attestation/attestation_flow.h"
-#include "chromeos/attestation/attestation_flow_integrated.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome/cryptohome_client.h"
@@ -164,7 +163,11 @@ void MachineCertificateUploaderImpl::Start() {
     cryptohome_client_ = CryptohomeClient::Get();
 
   if (!attestation_flow_) {
-    default_attestation_flow_ = std::make_unique<AttestationFlowIntegrated>();
+    std::unique_ptr<ServerProxy> attestation_ca_client(
+        new AttestationCAClient());
+    default_attestation_flow_.reset(new AttestationFlow(
+        cryptohome::AsyncMethodCaller::GetInstance(), cryptohome_client_,
+        std::move(attestation_ca_client)));
     attestation_flow_ = default_attestation_flow_.get();
   }
 

chrome/browser/chromeos/attestation/platform_verification_flow.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/permissions/permission_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chromeos/attestation/attestation_flow.h"
-#include "chromeos/attestation/attestation_flow_integrated.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
@@ -157,7 +156,9 @@ PlatformVerificationFlow::PlatformVerificationFlow()
       delegate_(NULL),
       timeout_delay_(base::TimeDelta::FromSeconds(kTimeoutInSeconds)) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  default_attestation_flow_ = std::make_unique<AttestationFlowIntegrated>();
+  std::unique_ptr<ServerProxy> attestation_ca_client(new AttestationCAClient());
+  default_attestation_flow_.reset(new AttestationFlow(
+      async_caller_, cryptohome_client_, std::move(attestation_ca_client)));
   attestation_flow_ = default_attestation_flow_.get();
   default_delegate_.reset(new DefaultDelegate());
   delegate_ = default_delegate_.get();

chrome/browser/chromeos/attestation/tpm_challenge_key_subtle.cc

@@ -19,7 +19,6 @@
 #include "chrome/browser/extensions/chrome_extension_function_details.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
-#include "chromeos/attestation/attestation_flow_integrated.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/constants/attestation_constants.h"
@@ -116,7 +115,10 @@ std::string GetKeyNameWithDefault(AttestationKeyType key_type,
 }  // namespace
 
 TpmChallengeKeySubtleImpl::TpmChallengeKeySubtleImpl()
-    : default_attestation_flow_(std::make_unique<AttestationFlowIntegrated>()),
+    : default_attestation_flow_(std::make_unique<AttestationFlow>(
+          cryptohome::AsyncMethodCaller::GetInstance(),
+          CryptohomeClient::Get(),
+          std::make_unique<AttestationCAClient>())),
       attestation_flow_(default_attestation_flow_.get()) {}
 
 TpmChallengeKeySubtleImpl::TpmChallengeKeySubtleImpl(

chrome/browser/chromeos/policy/browser_policy_connector_chromeos.cc

@@ -60,11 +60,11 @@
 #include "chrome/common/chrome_features.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/attestation/attestation_flow.h"
-#include "chromeos/attestation/attestation_flow_integrated.h"
 #include "chromeos/constants/chromeos_paths.h"
 #include "chromeos/constants/chromeos_switches.h"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
+#include "chromeos/dbus/cryptohome/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager/session_manager_client.h"
 #include "chromeos/dbus/upstart/upstart_client.h"
@@ -522,7 +522,10 @@ void BrowserPolicyConnectorChromeOS::RestartDeviceCloudPolicyInitializer() {
 
 std::unique_ptr<chromeos::attestation::AttestationFlow>
 BrowserPolicyConnectorChromeOS::CreateAttestationFlow() {
-  return std::make_unique<chromeos::attestation::AttestationFlowIntegrated>();
+  return std::make_unique<chromeos::attestation::AttestationFlow>(
+      cryptohome::AsyncMethodCaller::GetInstance(),
+      chromeos::CryptohomeClient::Get(),
+      std::make_unique<chromeos::attestation::AttestationCAClient>());
 }
 
 chromeos::AffiliationIDSet