arc: kArcCompatibleFilesystemChosen pref to local state and integer.

chrome/browser/chromeos/arc/arc_util_unittest.cc

 // Copyright 2017 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_util.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/sys_info.h"
 #include "base/test/scoped_command_line.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/arc/arc_session_manager.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_creation_flow.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/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/prefs/pref_service.h"
+#include "components/prefs/testing_pref_service.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
+#include "components/user_manager/known_user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_names.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace arc {
 namespace util {
 
 namespace {
 
@@ skipping 42 matching lines @@
   }
 
   void LogOut() { fake_user_manager_->RemoveUserFromList(account_id_); }
 
   chromeos::FakeChromeUserManager* fake_user_manager_;
   const AccountId account_id_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLogIn);
 };
 
+class FakeUserManagerWithLocalState : public chromeos::FakeChromeUserManager {
+ public:
+  FakeUserManagerWithLocalState()
+      : test_local_state_(base::MakeUnique<TestingPrefServiceSimple>()) {
+    RegisterPrefs(test_local_state_->registry());
+  }
+
+  PrefService* GetLocalState() const override {
+    return test_local_state_.get();
+  }
+
+ private:
+  std::unique_ptr<TestingPrefServiceSimple> test_local_state_;
+};

[xiyuan, 2017/04/14 06:51:31]

nit: DISALLOW_COPY_AND_ASSIGN(...)

[kinaba, 2017/04/14 06:57:13]

Done.

+
 }  // namespace
 
 class ChromeArcUtilTest : public testing::Test {
  public:
   ChromeArcUtilTest() = default;
   ~ChromeArcUtilTest() override = default;
 
   void SetUp() override {
     command_line_ = base::MakeUnique<base::test::ScopedCommandLine>();
     command_line_->GetProcessCommandLine()->InitFromArgv({"", "--enable-arc"});
 
     user_manager_enabler_ =
         base::MakeUnique<chromeos::ScopedUserManagerEnabler>(
-            new chromeos::FakeChromeUserManager());
+            new FakeUserManagerWithLocalState());
     chromeos::WallpaperManager::Initialize();
     profile_ = base::MakeUnique<TestingProfile>();
     profile_->set_profile_name(kTestProfileName);
   }
 
   void TearDown() override {
     profile_.reset();
     chromeos::WallpaperManager::Shutdown();
     user_manager_enabler_.reset();
     command_line_.reset();
@@ skipping 159 matching lines @@
 TEST_F(ChromeArcUtilTest, IsArcAllowedForProfile_DemoAccount) {
   ScopedLogIn login(GetFakeUserManager(), user_manager::DemoAccountId());
   EXPECT_FALSE(IsArcAllowedForProfile(profile()));
   EXPECT_FALSE(IsArcAllowedInAppListForProfile(profile()));
 }
 
 TEST_F(ChromeArcUtilTest, IsArcCompatibleFileSystemUsedForProfile) {
   // TODO(kinaba): Come up with some way to test the conditions below
   // causes differences in the return values of IsArcAllowedForProfile()
   // and IsArcAllowedInAppListForProfile().
-  ScopedLogIn login(GetFakeUserManager(),
-                    AccountId::FromUserEmailGaiaId(
-                        profile()->GetProfileUserName(), kTestGaiaId));
+  const AccountId id(AccountId::FromUserEmailGaiaId(
+      profile()->GetProfileUserName(), kTestGaiaId));
+  ScopedLogIn login(GetFakeUserManager(), id);
 
   // Unconfirmed + Old ARC
-  profile()->GetPrefs()->ClearPref(prefs::kArcCompatibleFilesystemChosen);
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=23", base::Time::Now());
   EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 
   // Unconfirmed + New ARC
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=25", base::Time::Now());
   EXPECT_FALSE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 
   // Old FS + Old ARC
-  profile()->GetPrefs()->SetBoolean(prefs::kArcCompatibleFilesystemChosen,
-                                    false);
+  user_manager::known_user::SetIntegerPref(
+      id, prefs::kArcCompatibleFilesystemChosen, kFileSystemIncompatible);
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=23", base::Time::Now());
   EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 
   // Old FS + New ARC
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=25", base::Time::Now());
   EXPECT_FALSE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 
   // New FS + Old ARC
-  profile()->GetPrefs()->SetBoolean(prefs::kArcCompatibleFilesystemChosen,
-                                    true);
+  user_manager::known_user::SetIntegerPref(
+      id, prefs::kArcCompatibleFilesystemChosen, kFileSystemCompatible);
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=23", base::Time::Now());
   EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 
   // New FS + New ARC
   base::SysInfo::SetChromeOSVersionInfoForTest(
       "CHROMEOS_ARC_ANDROID_SDK_VERSION=25", base::Time::Now());
   EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
+
+  // New FS (User notified) + Old ARC
+  user_manager::known_user::SetIntegerPref(
+      id, prefs::kArcCompatibleFilesystemChosen,
+      kFileSystemCompatibleAndNotified);
+  base::SysInfo::SetChromeOSVersionInfoForTest(
+      "CHROMEOS_ARC_ANDROID_SDK_VERSION=23", base::Time::Now());
+  EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
+
+  // New FS (User notified) + New ARC
+  base::SysInfo::SetChromeOSVersionInfoForTest(
+      "CHROMEOS_ARC_ANDROID_SDK_VERSION=25", base::Time::Now());
+  EXPECT_TRUE(IsArcCompatibleFileSystemUsedForProfile(profile()));
 }
 
 TEST_F(ChromeArcUtilTest, ArcPlayStoreEnabledForProfile) {
   // Ensure IsAllowedForProfile() true.
   ScopedLogIn login(GetFakeUserManager(),
                     AccountId::FromUserEmailGaiaId(
                         profile()->GetProfileUserName(), kTestGaiaId));
   ASSERT_TRUE(IsArcAllowedForProfile(profile()));
 
   // By default, Google Play Store is disabled.
@@ skipping 85 matching lines @@
   EXPECT_FALSE(AreArcAllOptInPreferencesManagedForProfile(profile()));
 
   // Both OptIn prefs are set to managed values, and the function returns true.
   profile()->GetTestingPrefService()->SetManagedPref(
       prefs::kArcBackupRestoreEnabled, base::MakeUnique<base::Value>(false));
   EXPECT_TRUE(AreArcAllOptInPreferencesManagedForProfile(profile()));
 }
 
 }  // namespace util
 }  // namespace arc