Extract ArcTermsOfServiceNegotiator implementation.

chrome/browser/chromeos/arc/arc_support_host.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 "chrome/browser/chromeos/arc/arc_support_host.h"
 
 #include <string>
 #include <utility>
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
+#include "base/bind.h"
 #include "base/i18n/timezone.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
@@ skipping 58 matching lines @@
 constexpr char kIsBackupRestoreEnabled[] = "isBackupRestoreEnabled";
 constexpr char kIsLocationServiceEnabled[] = "isLocationServiceEnabled";
 
 // "onRetryClicked" is fired when a user clicks "RETRY" button on the error
 // page.
 constexpr char kEventOnRetryClicked[] = "onRetryClicked";
 
 // "onSendFeedbackClicked" is fired when a user clicks "Send Feedback" button.
 constexpr char kEventOnSendFeedbackClicked[] = "onSendFeedbackClicked";
 
+void RequestOpenApp(Profile* profile) {
+  const extensions::Extension* extension =
+      extensions::ExtensionRegistry::Get(profile)->GetInstalledExtension(
+          ArcSupportHost::kHostAppId);
+  DCHECK(extension);
+  DCHECK(
+      extensions::util::IsAppLaunchable(ArcSupportHost::kHostAppId, profile));
+  OpenApplication(CreateAppLaunchParamsUserContainer(
+      profile, extension, WindowOpenDisposition::NEW_WINDOW,
+      extensions::SOURCE_CHROME_INTERNAL));
+}
+
 std::ostream& operator<<(std::ostream& os, ArcSupportHost::UIPage ui_page) {
   switch (ui_page) {
     case ArcSupportHost::UIPage::NO_PAGE:
       return os << "NO_PAGE";
     case ArcSupportHost::UIPage::TERMS:
       return os << "TERMS";
     case ArcSupportHost::UIPage::LSO:
       return os << "LSO";
     case ArcSupportHost::UIPage::ARC_LOADING:
       return os << "ARC_LOADING";
@@ skipping 34 matching lines @@
 }
 
 }  // namespace
 
 // static
 const char ArcSupportHost::kHostAppId[] = "cnbgggchhmkkdmeppjobngjoejnihlei";
 
 // static
 const char ArcSupportHost::kStorageId[] = "arc_support";
 
-ArcSupportHost::ArcSupportHost(Profile* profile) : profile_(profile) {}
+ArcSupportHost::ArcSupportHost(Profile* profile)
+    : profile_(profile),
+      request_open_app_callback_(base::Bind(&RequestOpenApp)) {
+  DCHECK(profile_);
+}
 
 ArcSupportHost::~ArcSupportHost() {
   if (message_host_)
     DisconnectMessageHost();
 }
 
 void ArcSupportHost::AddObserver(Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
@@ skipping 156 matching lines @@
 
 void ArcSupportHost::SetMessageHost(arc::ArcSupportMessageHost* message_host) {
   if (message_host_ == message_host)
     return;
 
   app_start_pending_ = false;
   if (message_host_)
     DisconnectMessageHost();
   message_host_ = message_host;
   message_host_->SetObserver(this);
-  display::Screen::GetScreen()->AddObserver(this);
+  display::Screen* screen = display::Screen::GetScreen();

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

Relaxed for testing. Ditto for below.

+  if (screen)
+    screen->AddObserver(this);
 
   if (!Initialize()) {
     Close();
     return;
   }
 
   // Hereafter, install the requested ui state into the ARC support Chrome app.
 
   // Set preference checkbox state.
   SendPreferenceCheckboxUpdate(kActionSetMetricsMode, metrics_checkbox_);
@@ skipping 14 matching lines @@
 
 void ArcSupportHost::UnsetMessageHost(
     arc::ArcSupportMessageHost* message_host) {
   if (message_host_ != message_host)
     return;
   DisconnectMessageHost();
 }
 
 void ArcSupportHost::DisconnectMessageHost() {
   DCHECK(message_host_);
-  display::Screen::GetScreen()->RemoveObserver(this);
+  display::Screen* screen = display::Screen::GetScreen();
+  if (screen)
+    screen->RemoveObserver(this);
   message_host_->SetObserver(nullptr);
   message_host_ = nullptr;
 }
 
 void ArcSupportHost::RequestAppStart() {
   DCHECK(!message_host_);
   DCHECK(!app_start_pending_);
 
   app_start_pending_ = true;
-  const extensions::Extension* extension =
-      extensions::ExtensionRegistry::Get(profile_)->GetInstalledExtension(
-          kHostAppId);
-  DCHECK(extension);
-  DCHECK(extensions::util::IsAppLaunchable(kHostAppId, profile_));
-  OpenApplication(CreateAppLaunchParamsUserContainer(
-      profile_, extension, WindowOpenDisposition::NEW_WINDOW,
-      extensions::SOURCE_CHROME_INTERNAL));
+  request_open_app_callback_.Run(profile_);
+}
+
+void ArcSupportHost::SetRequestOpenAppCallbackForTest(
+    const RequestOpenAppCallback& callback) {
+  DCHECK(!message_host_);
+  DCHECK(!app_start_pending_);
+  DCHECK(!callback.is_null());
+  request_open_app_callback_ = callback;
 }
 
 bool ArcSupportHost::Initialize() {
   DCHECK(message_host_);
 
   auto loadtime_data = base::MakeUnique<base::DictionaryValue>();
   base::string16 device_name = ash::GetChromeOSDeviceName();
   loadtime_data->SetString(
       "greetingHeader",
       l10n_util::GetStringFUTF16(IDS_ARC_OPT_IN_DIALOG_HEADER, device_name));
@@ skipping 73 matching lines @@
 
   const std::string& app_locale = g_browser_process->GetApplicationLocale();
   webui::SetLoadTimeDataDefaults(app_locale, loadtime_data.get());
 
   base::DictionaryValue message;
   message.SetString(kAction, kActionInitialize);
   message.Set(kData, std::move(loadtime_data));
 
   const std::string device_id = user_manager::known_user::GetDeviceId(
       multi_user_util::GetAccountIdFromProfile(profile_));
-  DCHECK(!device_id.empty());

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

Relaxed for testing.

   message.SetString(kDeviceId, device_id);
 
   message_host_->SendMessage(message);
   return true;
 }
 
 void ArcSupportHost::OnDisplayAdded(const display::Display& new_display) {}
 
 void ArcSupportHost::OnDisplayRemoved(const display::Display& old_display) {}
 
@@ skipping 45 matching lines @@
     for (auto& observer : observer_list_)
       observer.OnRetryClicked();
   } else if (event == kEventOnSendFeedbackClicked) {
     for (auto& observer : observer_list_)
       observer.OnSendFeedbackClicked();
   } else {
     LOG(ERROR) << "Unknown message: " << event;
     NOTREACHED();
   }
 }