arc: ARC loading progress should not be shown when started from OOBE.

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"
@@ skipping 188 matching lines @@
 }
 
 void ArcSupportHost::ShowTermsOfService() {
   ShowPage(UIPage::TERMS);
 }
 
 void ArcSupportHost::ShowLso() {
   ShowPage(UIPage::LSO);
 }
 
-void ArcSupportHost::ShowArcLoading() {
+void ArcSupportHost::ShowArcLoading(bool force_activate) {
+  if (!force_activate && !message_host_) {

[hidehiko, 2016/12/20 15:20:45]

Please do not depend on message_host_.
It's life time management is out of ARC's control.

Alternative is using ui_page_ as I suggested in my prev comment, or tracking the
state in the ArcSessionManager.

[khmel, 2016/12/20 16:27:58]

Please see code below, L 219, where absent of message_host_ triggers showing the
app.

+    ui_page_ = UIPage::ARC_LOADING;
+    return;
+  }
   ShowPage(UIPage::ARC_LOADING);
 }
 
 void ArcSupportHost::ShowPage(UIPage ui_page) {
   ui_page_ = ui_page;
   if (!message_host_) {
     if (app_start_pending_) {
       VLOG(2) << "ArcSupportHost::ShowPage(" << ui_page << ") is called "
               << "before connection to ARC support Chrome app has finished "
               << "establishing.";
@@ skipping 306 matching lines @@
   } else if (event == kEventOnAgreed) {
     bool is_metrics_enabled;
     bool is_backup_restore_enabled;
     bool is_location_service_enabled;
     if (message.GetBoolean(kIsMetricsEnabled, &is_metrics_enabled) &&
         message.GetBoolean(kIsBackupRestoreEnabled,
                            &is_backup_restore_enabled) &&
         message.GetBoolean(kIsLocationServiceEnabled,
                            &is_location_service_enabled)) {
       for (auto& observer : observer_list_) {
-        observer.OnTermsAgreed(is_metrics_enabled, is_backup_restore_enabled,
-                               is_location_service_enabled);
+        observer.OnTermsAccepted(is_metrics_enabled, is_backup_restore_enabled,
+                                 is_location_service_enabled);
       }
     } else {
       NOTREACHED();
     }
   } else if (event == kEventOnRetryClicked) {
     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();
   }
 }