cros: Unify oobe View/Actor naming to just View.

chrome/browser/chromeos/arc/arc_session_manager_unittest.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 <memory>
 #include <string>
 #include <tuple>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
 #include "base/run_loop.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/arc/arc_optin_uma.h"
 #include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/arc/optin/arc_terms_of_service_oobe_negotiator.h"
 #include "chrome/browser/chromeos/arc/test/arc_data_removed_waiter.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor.h"
-#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_actor_observer.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view.h"
+#include "chrome/browser/chromeos/login/screens/arc_terms_of_service_screen_view_observer.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/policy/profile_policy_connector_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/app_list/arc/arc_app_list_prefs.h"
@@ skipping 673 matching lines @@
   CloseLoginDisplayHost();
   EXPECT_FALSE(ArcSessionManager::IsOobeOptInActive());
   GetFakeUserManager()->set_current_user_new(true);
   EXPECT_FALSE(ArcSessionManager::IsOobeOptInActive());
   CreateLoginDisplayHost();
   EXPECT_TRUE(ArcSessionManager::IsOobeOptInActive());
 }
 
 class ArcSessionOobeOptInNegotiatorTest
     : public ArcSessionOobeOptInTest,
-      public chromeos::ArcTermsOfServiceScreenActor,
+      public chromeos::ArcTermsOfServiceScreenView,
       public testing::WithParamInterface<bool> {
  public:
   ArcSessionOobeOptInNegotiatorTest() = default;
 
   void SetUp() override {
     ArcSessionOobeOptInTest::SetUp();
 
     AppendEnableArcOOBEOptInSwitch();
 
     ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(

[hidehiko, 2017/02/23 05:34:07]

s/Actor/View, too?

[jdufault, 2017/02/24 00:40:15]

Done.

         this);
 
     GetFakeUserManager()->set_current_user_new(true);
 
     CreateLoginDisplayHost();
 
     if (IsManagedUser()) {
       policy::ProfilePolicyConnector* const connector =
           policy::ProfilePolicyConnectorFactory::GetForBrowserContext(
               profile());
       connector->OverrideIsManagedForTesting(true);
 
       profile()->GetTestingPrefService()->SetManagedPref(
           prefs::kArcEnabled, new base::FundamentalValue(true));
     }
 
     arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
   }
 
   void TearDown() override {
     // Correctly stop service.
     arc_session_manager()->Shutdown();
 
     ArcTermsOfServiceOobeNegotiator::SetArcTermsOfServiceScreenActorForTesting(

[hidehiko, 2017/02/23 05:34:07]

ditto.

[jdufault, 2017/02/24 00:40:15]

Done.

         nullptr);
 
     ArcSessionOobeOptInTest::TearDown();
   }
 
  protected:
   bool IsManagedUser() { return GetParam(); }
 
   void ReportResult(bool accepted) {
     for (auto& observer : observer_list_) {
       if (accepted)
         observer.OnAccept();
       else
         observer.OnSkip();
     }
     base::RunLoop().RunUntilIdle();
   }
 
   void ReportActorDestroyed() {

[hidehiko, 2017/02/23 05:34:07]

s/Actor/View/ here, too?

[jdufault, 2017/02/24 00:40:15]

Done.

     for (auto& observer : observer_list_)
-      observer.OnActorDestroyed(this);
+      observer.OnViewDestroyed(this);
     base::RunLoop().RunUntilIdle();
   }
 
   void MaybeWaitForDataRemoved() {
     // In case of managed user we no need to wait data removal because
     // ArcSessionManager is initialized with arc.enabled = true already and
     // request to remove ARC data is not issued.
     if (IsManagedUser())
       return;
 
     DCHECK_EQ(ArcSessionManager::State::REMOVING_DATA_DIR,
               ArcSessionManager::Get()->state());
     ArcDataRemovedWaiter().Wait();
   }
 
-  chromeos::ArcTermsOfServiceScreenActor* actor() { return this; }
+  chromeos::ArcTermsOfServiceScreenView* view() { return this; }
 
  private:
-  // ArcTermsOfServiceScreenActor:
+  // ArcTermsOfServiceScreenView:
   void AddObserver(
-      chromeos::ArcTermsOfServiceScreenActorObserver* observer) override {
+      chromeos::ArcTermsOfServiceScreenViewObserver* observer) override {
     observer_list_.AddObserver(observer);
   }
 
   void RemoveObserver(
-      chromeos::ArcTermsOfServiceScreenActorObserver* observer) override {
+      chromeos::ArcTermsOfServiceScreenViewObserver* observer) override {
     observer_list_.RemoveObserver(observer);
   }
 
   void Show() override {
     // To match ArcTermsOfServiceScreenHandler logic where prefs::kArcEnabled is
     // set to true on showing UI.
     profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
   }
 
   void Hide() override {}
 
-  base::ObserverList<chromeos::ArcTermsOfServiceScreenActorObserver>
+  base::ObserverList<chromeos::ArcTermsOfServiceScreenViewObserver>
       observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(ArcSessionOobeOptInNegotiatorTest);
 };
 
 INSTANTIATE_TEST_CASE_P(ArcSessionOobeOptInNegotiatorTestImpl,
                         ArcSessionOobeOptInNegotiatorTest,
                         ::testing::Values(true, false));
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsAccepted) {
-  actor()->Show();
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   ReportResult(true);
   EXPECT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
   EXPECT_TRUE(arc_session_manager()->IsArcPlayStoreEnabled());
 }
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsRejected) {
-  actor()->Show();
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   ReportResult(false);
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
   EXPECT_FALSE(!IsManagedUser() &&
                arc_session_manager()->IsArcPlayStoreEnabled());
 }
 
 TEST_P(ArcSessionOobeOptInNegotiatorTest, OobeTermsActorDestroyed) {

[hidehiko, 2017/02/23 05:34:07]

s/Actor/View/ too_

[jdufault, 2017/02/24 00:40:15]

Done.

-  actor()->Show();
+  view()->Show();
   MaybeWaitForDataRemoved();
   EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
   CloseLoginDisplayHost();
   ReportActorDestroyed();
   EXPECT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
   EXPECT_FALSE(!IsManagedUser() &&
                arc_session_manager()->IsArcPlayStoreEnabled());
 }
 
 }  // namespace arc