Extract ArcTermsOfServiceNegotiator implementation.

chrome/browser/chromeos/arc/arc_support_host.h

Index: chrome/browser/chromeos/arc/arc_support_host.h
diff --git a/chrome/browser/chromeos/arc/arc_support_host.h b/chrome/browser/chromeos/arc/arc_support_host.h
index 1712611a7d89d03f5cbfc1649ac794adc441ae76..55fca3b1ef42ae9427a2effea96db5221e3ab3cb 100644
--- a/chrome/browser/chromeos/arc/arc_support_host.h
+++ b/chrome/browser/chromeos/arc/arc_support_host.h
@@ -8,6 +8,7 @@
 #include <memory>
 #include <string>
 
+#include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/arc/extensions/arc_support_message_host.h"
@@ -51,8 +52,6 @@ class ArcSupportHost : public arc::ArcSupportMessageHost::Observer,
     virtual void OnWindowClosed() {}
 
     // Called when the user press AGREE button on ToS page.
-    // TODO(hidehiko): Currently, due to implementation reason,
-    // this is also called when RETRY on error page is clicked. Fix this.

[hidehiko, 2016/11/28 12:42:54]

This is obsolete. Removed.

     virtual void OnTermsAgreed(bool is_metrics_enabled,
                                bool is_backup_and_restore_enabled,
                                bool is_location_service_enabled) {}
@@ -70,6 +69,8 @@ class ArcSupportHost : public arc::ArcSupportMessageHost::Observer,
   static const char kHostAppId[];
   static const char kStorageId[];
 
+  using RequestOpenAppCallback = base::Callback<void(Profile* profile)>;
+
   explicit ArcSupportHost(Profile* profile);
   ~ArcSupportHost() override;
 
@@ -124,6 +125,8 @@ class ArcSupportHost : public arc::ArcSupportMessageHost::Observer,
   // TODO(hidehiko): Remove this exposure.
   UIPage ui_page() const { return ui_page_; }
 
+  void SetRequestOpenAppCallbackForTest(const RequestOpenAppCallback& callback);

[Luis Héctor Chávez, 2016/11/29 00:15:28]

nit: ...ForTesting

[hidehiko, 2016/11/29 17:43:28]

Done.

+
  private:
   struct PreferenceCheckboxData {
     PreferenceCheckboxData() : PreferenceCheckboxData(false, false) {}
@@ -155,6 +158,7 @@ class ArcSupportHost : public arc::ArcSupportMessageHost::Observer,
   void DisconnectMessageHost();
 
   Profile* const profile_;
+  RequestOpenAppCallback request_open_app_callback_;
 
   base::ObserverList<Observer> observer_list_;