arc: Make request to remove Android's data folder persistent.

chrome/browser/chromeos/arc/arc_session_manager_unittest.cc

Index: chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
diff --git a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
index 7403af09cf93d450cc35f63daf901471a04261de..8edeb42d02d6b77e5fce795bff33e037b7bbfc4d 100644
--- a/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
+++ b/chrome/browser/chromeos/arc/arc_session_manager_unittest.cc
@@ -27,6 +27,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/fake_session_manager_client.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/test/fake_arc_bridge_service.h"
 #include "components/prefs/pref_service.h"
@@ -53,6 +54,9 @@ class ArcSessionManagerTest : public testing::Test {
   ~ArcSessionManagerTest() override = default;
 
   void SetUp() override {
+    chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
+        base::WrapUnique(new chromeos::FakeSessionManagerClient));
+
     chromeos::DBusThreadManager::Initialize();
 
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -98,6 +102,13 @@ class ArcSessionManagerTest : public testing::Test {
     return arc_session_manager_.get();
   }
 
+  void WaitForDataRemoved(ArcSessionManager::State expected_state) {
+    ASSERT_EQ(ArcSessionManager::State::DELETING_DATA_FOLDER,

[hidehiko, 2016/12/06 05:05:30]

This won't work.

ASSERT_EQ is a macro to return from the current function.
So, ASSERT_EQ in a utility method just returns from the utility method, but will
not quit the test scenario in caller, unfortunately.

[khmel, 2016/12/06 18:16:13]

IIUC abort is called if any problem with ASSERT_EQ. Anyway I changed to
returning bool result and checking it in test body.

[hidehiko, 2016/12/06 18:32:10]

FYI:
https://cs.chromium.org/chromium/src/testing/gtest/include/gtest/internal/gte...
is the impl, IIUC.

+              arc_session_manager()->state());
+    base::RunLoop().RunUntilIdle();
+    ASSERT_EQ(expected_state, arc_session_manager()->state());
+  }
+
  private:
   void StartPreferenceSyncing() const {
     PrefServiceSyncableFromProfile(profile_.get())
@@ -127,14 +138,17 @@ TEST_F(ArcSessionManagerTest, PrefChangeTriggersService) {
   ASSERT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
-  ASSERT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
+
+  WaitForDataRemoved(ArcSessionManager::State::STOPPED);
 
   pref->SetBoolean(prefs::kArcEnabled, true);
+  base::RunLoop().RunUntilIdle();
   ASSERT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
 
   pref->SetBoolean(prefs::kArcEnabled, false);
-  ASSERT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
+
+  WaitForDataRemoved(ArcSessionManager::State::STOPPED);
 
   // Correctly stop service.
   arc_session_manager()->Shutdown();
@@ -193,9 +207,10 @@ TEST_F(ArcSessionManagerTest, BaseWorkflow) {
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
 
   // By default ARC is not enabled.
-  ASSERT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
+  WaitForDataRemoved(ArcSessionManager::State::STOPPED);
 
   profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
+  base::RunLoop().RunUntilIdle();
 
   // Setting profile and pref initiates a code fetching process.
   ASSERT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
@@ -236,11 +251,16 @@ TEST_F(ArcSessionManagerTest, CancelFetchingDisablesArc) {
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
   pref->SetBoolean(prefs::kArcEnabled, true);
+  base::RunLoop().RunUntilIdle();
+
   ASSERT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
             arc_session_manager()->state());
 
   arc_session_manager()->CancelAuthCode();
-  ASSERT_EQ(ArcSessionManager::State::STOPPED, arc_session_manager()->state());
+
+  // Wait until data is removed.
+  WaitForDataRemoved(ArcSessionManager::State::STOPPED);
+
   ASSERT_FALSE(pref->GetBoolean(prefs::kArcEnabled));
 
   // Correctly stop service.
@@ -252,6 +272,7 @@ TEST_F(ArcSessionManagerTest, CloseUIKeepsArcEnabled) {
 
   arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
   pref->SetBoolean(prefs::kArcEnabled, true);
+  base::RunLoop().RunUntilIdle();
 
   arc_session_manager()->StartArc();
 
@@ -377,4 +398,55 @@ TEST_F(ArcSessionManagerTest, DisabledForNonPrimaryProfile) {
   arc_session_manager()->Shutdown();
 }
 
+TEST_F(ArcSessionManagerTest, RemoveDataFolder) {
+  profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, false);
+  // Starting session manager with prefs::kArcEnabled off automatically removes
+  // Android's data folder.
+  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
+  EXPECT_TRUE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+  EXPECT_EQ(ArcSessionManager::State::DELETING_DATA_FOLDER,
+            arc_session_manager()->state());
+  // Enable ARC. Data is removed asyncronously. At this moment session manager
+  // should be in DELETING_DATA_FOLDER state.
+  profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, true);
+  EXPECT_TRUE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+  EXPECT_EQ(ArcSessionManager::State::DELETING_DATA_FOLDER,
+            arc_session_manager()->state());
+  // Wait until data is removed.
+  base::RunLoop().RunUntilIdle();
+  EXPECT_FALSE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+  EXPECT_EQ(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE,
+            arc_session_manager()->state());
+  arc_session_manager()->StartArc();
+  EXPECT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
+
+  // Now request to remove data and stop session manager.
+  arc_session_manager()->RemoveArcData();
+  ASSERT_TRUE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+  EXPECT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
+  arc_session_manager()->Shutdown();
+  base::RunLoop().RunUntilIdle();
+  // Request should persist.
+  ASSERT_TRUE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+
+  // Emulate next sign-in. Data should be removed first and ARC started after.
+  arc_session_manager()->OnPrimaryUserProfilePrepared(profile());
+  EXPECT_TRUE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+
+  WaitForDataRemoved(ArcSessionManager::State::SHOWING_TERMS_OF_SERVICE);
+
+  EXPECT_FALSE(
+      profile()->GetPrefs()->GetBoolean(prefs::kArcDataRemoveRequested));
+
+  arc_session_manager()->StartArc();
+  EXPECT_EQ(ArcSessionManager::State::ACTIVE, arc_session_manager()->state());
+  arc_session_manager()->Shutdown();
+}
+
 }  // namespace arc