Add CheckAndroidManagement to ARC sign-in flow.

chrome/browser/chromeos/arc/arc_auth_service_browsertest.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 "base/command_line.h"
+#include "base/files/scoped_temp_dir.h"
+#include "base/macros.h"
+#include "base/memory/ptr_util.h"
+#include "base/run_loop.h"
+#include "base/time/time.h"
+#include "chrome/browser/browser_process.h"

[bartfab (slow), 2016/05/02 14:55:49]

Nit: Not used.

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+#include "chrome/browser/chromeos/arc/arc_auth_service.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/policy/profile_policy_connector.h"
+#include "chrome/browser/policy/profile_policy_connector_factory.h"
+#include "chrome/browser/policy/test/local_policy_test_server.h"
+#include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
+#include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
+#include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
+#include "chrome/common/pref_names.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/testing_profile.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
+#include "chromeos/dbus/fake_session_manager_client.h"
+#include "components/arc/arc_bridge_service_impl.h"
+#include "components/arc/arc_service_manager.h"
+#include "components/arc/test/fake_arc_bridge_bootstrap.h"
+#include "components/arc/test/fake_arc_bridge_instance.h"
+#include "components/policy/core/common/policy_switches.h"
+#include "components/prefs/pref_service.h"
+#include "components/signin/core/account_id/account_id.h"
+#include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
+#include "components/user_manager/user_manager.h"
+#include "url/gurl.h"
+
+namespace arc {
+
+const char kRefreshToken[] = "fake-refresh-token";
+
+// Set managed auth token for Android managed accounts.
+const char kManagedAuthToken[] = "managed-auth-token";
+// Set unmanaged auth token for other Android unmanaged accounts.
+const char kUnmanagedAuthToken[] = "unmanaged-auth-token";
+
+// Base ArcAuthService observer.
+class ArcAuthServiceObserver : public ArcAuthService::Observer {
+ public:
+  // ArcAuthService::Observer:
+  ~ArcAuthServiceObserver() override {
+    run_loop_.reset();

[bartfab (slow), 2016/05/02 14:55:49]

Why do you need to explicitly reset the |run_loop_| member?

[Polina Bondarenko, 2016/05/03 13:41:55]

No need to reset it. Removed.

+    ArcAuthService::Get()->RemoveObserver(this);
+  }
+
+  void Wait() {
+    run_loop_.reset(new base::RunLoop);
+    run_loop_->Run();
+    run_loop_.reset();
+  }
+
+ protected:
+  ArcAuthServiceObserver() { ArcAuthService::Get()->AddObserver(this); }
+
+  std::unique_ptr<base::RunLoop> run_loop_;
+
+  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceObserver);
+};
+
+// Observer of ArcAuthService state change.
+class ArcAuthServiceStateObserver : public ArcAuthServiceObserver {
+ public:
+  ArcAuthServiceStateObserver() : ArcAuthServiceObserver() {}
+
+  // ArcAuthService::Observer:
+  void OnOptInChanged(ArcAuthService::State state) override {
+    if (!run_loop_)
+      return;
+    run_loop_->Quit();
+  }
+
+ protected:
+  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceStateObserver);
+};
+
+// Observer of ARC bridge shutdown.
+class ArcAuthServiceShutdownObserver : public ArcAuthServiceObserver {
+ public:
+  ArcAuthServiceShutdownObserver() : ArcAuthServiceObserver() {}
+
+  // ArcAuthService::Observer:
+  void OnShutdownBridge() override {
+    if (!run_loop_)
+      return;
+    run_loop_->Quit();
+  }
+
+ protected:
+  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceShutdownObserver);
+};
+
+class ArcAuthServiceTest : public InProcessBrowserTest {
+ protected:
+  ArcAuthServiceTest() {}
+
+  // InProcessBrowserTest:
+  ~ArcAuthServiceTest() override {}
+
+  void SetUpInProcessBrowserTestFixture() override {
+    // Start test device management server.
+    test_server_.reset(new policy::LocalPolicyTestServer());
+    ASSERT_TRUE(test_server_->Start());

[bartfab (slow), 2016/05/02 14:55:48]

Nit: #include "testing/gtest/include/gtest/gtest.h"

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+
+    // Specify device management server URL.
+    std::string url = test_server_->GetServiceURL().spec();
+    base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();

[bartfab (slow), 2016/05/02 14:55:49]

Nit: const pointer

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+    command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
+                                    url);
+
+    // Enable ARC.
+    fake_session_manager_client_ = new chromeos::FakeSessionManagerClient;
+    fake_session_manager_client_->set_arc_available(true);
+    chromeos::DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
+        std::unique_ptr<chromeos::SessionManagerClient>(

[bartfab (slow), 2016/05/02 14:55:49]

Nit: #include “chromeos/dbus/session_manager_client.h”

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+            fake_session_manager_client_));
+
+    // Mock out ARC bridge.
+    fake_arc_bridge_instance_.reset(new FakeArcBridgeInstance);
+    ArcServiceManager::SetArcBridgeServiceForTesting(
+        base::WrapUnique(new ArcBridgeServiceImpl(base::WrapUnique(
+            new FakeArcBridgeBootstrap(fake_arc_bridge_instance_.get())))));
+  }
+
+  void SetUpOnMainThread() override {
+    user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
+        new chromeos::FakeChromeUserManager));
+  }
+
+  void TearDownOnMainThread() override { user_manager_enabler_.reset(); }
+
+  void SetUpTest(const std::string& username) {

[bartfab (slow), 2016/05/02 14:55:49]

Why are SetUpTest() and TearDownTest() not part of the test fixture's regular
setup flow? IIRC, browser tests are set up and torn down completely per test
case.

[Polina Bondarenko, 2016/05/03 13:41:55]

Fixed, thanks, didn't know that.

+    // Init ArcAuthService for testing.
+    ArcAuthService::DisableUIForTesting();
+    ArcAuthService::EnableCheckAndroidManagementForTesting();
+
+    EXPECT_TRUE(temp_dir_.CreateUniqueTempDir());
+
+    // Create test profile.
+    TestingProfile::Builder profile_builder;
+    profile_builder.SetPath(temp_dir_.path().AppendASCII("TestArcProfile"));

[bartfab (slow), 2016/05/02 14:55:49]

Nit: #include “base/files/file_path.h”

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+    profile_builder.SetProfileName(username);
+    profile_builder.AddTestingFactory(
+        ProfileOAuth2TokenServiceFactory::GetInstance(),
+        BuildFakeProfileOAuth2TokenService);
+    profile_ = profile_builder.Build();
+    token_service_ = static_cast<FakeProfileOAuth2TokenService*>(
+        ProfileOAuth2TokenServiceFactory::GetForProfile(profile()));
+    token_service_->UpdateCredentials("", kRefreshToken);
+
+    const AccountId account_id(
+        AccountId::FromUserEmailGaiaId(username, "1234567890"));
+    GetFakeUserManager()->AddUser(account_id);
+    GetFakeUserManager()->LoginUser(account_id);
+
+    profile()->GetPrefs()->SetBoolean(prefs::kArcSignedIn, true);
+
+    // Setup ARC for test profile.

[bartfab (slow), 2016/05/02 14:55:48]

Nit: s/Setup/Set up/

[Polina Bondarenko, 2016/05/03 13:41:54]

Done.

+    ArcServiceManager::Get()->OnPrimaryUserProfilePrepared(
+        multi_user_util::GetAccountIdFromProfile(profile()));
+    ArcAuthService::Get()->OnPrimaryUserProfilePrepared(profile());
+  }
+
+  void TearDownTest() {
+    ArcAuthService::Get()->Shutdown();
+    profile_.reset();
+  }
+
+  chromeos::FakeChromeUserManager* GetFakeUserManager() const {
+    return static_cast<chromeos::FakeChromeUserManager*>(
+        user_manager::UserManager::Get());
+  }
+
+  Profile* profile() { return profile_.get(); }
+
+  FakeProfileOAuth2TokenService* token_service() { return token_service_; }
+
+ private:
+  std::unique_ptr<policy::LocalPolicyTestServer> test_server_;
+  chromeos::FakeSessionManagerClient* fake_session_manager_client_;

[bartfab (slow), 2016/05/02 14:55:49]

Nit: No need for this to be a member variable. It is only used in a single
method.

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+  std::unique_ptr<FakeArcBridgeInstance> fake_arc_bridge_instance_;
+  std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
+  base::ScopedTempDir temp_dir_;
+  std::unique_ptr<TestingProfile> profile_;
+  FakeProfileOAuth2TokenService* token_service_;
+
+  DISALLOW_COPY_AND_ASSIGN(ArcAuthServiceTest);
+};
+
+IN_PROC_BROWSER_TEST_F(ArcAuthServiceTest, ConsumerAccount) {
+  SetUpTest("test@example.com");
+
+  PrefService* pref = profile()->GetPrefs();

[bartfab (slow), 2016/05/02 14:55:49]

Nit 1: Here and in the other tests: s/pref/prefs/
Nit 2: Here and in the other tests: const pointer

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+
+  pref->SetBoolean(prefs::kArcEnabled, true);
+  token_service()->IssueTokenForAllPendingRequests(kUnmanagedAuthToken,
+                                                   base::Time::Max());
+  ArcAuthServiceStateObserver observer;
+  observer.Wait();
+  ASSERT_EQ(ArcAuthService::State::ACTIVE, ArcAuthService::Get()->state());
+  TearDownTest();
+}
+
+IN_PROC_BROWSER_TEST_F(ArcAuthServiceTest, WellKnownConsumerAccount) {
+  SetUpTest("test@gmail.com");
+
+  PrefService* pref = profile()->GetPrefs();
+
+  pref->SetBoolean(prefs::kArcEnabled, true);
+  ASSERT_EQ(ArcAuthService::State::ACTIVE, ArcAuthService::Get()->state());
+  TearDownTest();
+}
+
+IN_PROC_BROWSER_TEST_F(ArcAuthServiceTest, ManagedChromeAccount) {
+  SetUpTest("test@managedchrome.com");
+  policy::ProfilePolicyConnector* const connector =

[bartfab (slow), 2016/05/02 14:55:49]

Nit: const pointer

[Polina Bondarenko, 2016/05/03 13:41:55]

Done.

+      policy::ProfilePolicyConnectorFactory::GetForBrowserContext(profile());
+  connector->OverrideIsManagedForTesting(true);
+
+  PrefService* pref = profile()->GetPrefs();
+
+  pref->SetBoolean(prefs::kArcEnabled, true);
+  ASSERT_EQ(ArcAuthService::State::ACTIVE, ArcAuthService::Get()->state());
+  TearDownTest();
+}
+
+IN_PROC_BROWSER_TEST_F(ArcAuthServiceTest, ManagedAndroidAccount) {
+  SetUpTest("test@example.com");
+
+  PrefService* pref = profile()->GetPrefs();
+
+  pref->SetBoolean(prefs::kArcEnabled, true);
+  token_service()->IssueTokenForAllPendingRequests(kManagedAuthToken,
+                                                   base::Time::Max());
+  ArcAuthServiceShutdownObserver observer;
+  observer.Wait();
+  ASSERT_EQ(ArcAuthService::State::STOPPED, ArcAuthService::Get()->state());
+  TearDownTest();
+}
+
+}  // namespace arc