SupervisedUsers : Fix transaction cleanup

chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc

Index: chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
diff --git a/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc b/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
index def99d6198809d22661ed592aa126ba57d4932ba..e1ffab988b8801818bb9afdf93f460a097fe4af0 100644
--- a/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
+++ b/chrome/browser/chromeos/login/managed/supervised_user_creation_browsertest.cc
@@ -126,6 +126,7 @@ class SupervisedUserTest : public chromeos::LoginManagerTest {
   void CreateSupervisedUser();
   void SigninAsSupervisedUser();
   void RemoveSupervisedUser();
+  void LogInAsManagerAndFillUserData();
 
  protected:
    cryptohome::MockAsyncMethodCaller* mock_async_method_caller_;
@@ -143,7 +144,7 @@ void SupervisedUserTest::PrepareUsers() {
   chromeos::StartupUtils::MarkOobeCompleted();
 }
 
-void SupervisedUserTest::CreateSupervisedUser() {
+void SupervisedUserTest::LogInAsManagerAndFillUserData() {
   // Create supervised user.
 
   // Navigate to supervised user creation screen.
@@ -215,6 +216,10 @@ void SupervisedUserTest::CreateSupervisedUser() {
 
   JSEval("$('managed-user-creation').updateNextButtonForUser_()");
   JSExpect("!$('managed-user-creation-next-button').disabled");
+}
+
+void SupervisedUserTest::CreateSupervisedUser() {
+  LogInAsManagerAndFillUserData();
 
   EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
       .Times(1);
@@ -283,10 +288,19 @@ void SupervisedUserTest::RemoveSupervisedUser() {
 class SupervisedUserCreationTest : public SupervisedUserTest {
  public:
   SupervisedUserCreationTest() : SupervisedUserTest() {}
+
  private:
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserCreationTest);
 };
 
+class SupervisedUserTransactionCleanupTest : public SupervisedUserTest {
+ public:
+  SupervisedUserTransactionCleanupTest() : SupervisedUserTest () {}
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SupervisedUserTransactionCleanupTest);
+};
+
 class SupervisedUserOwnerCreationTest : public SupervisedUserTest {
  public:
   SupervisedUserOwnerCreationTest() : SupervisedUserTest() {}
@@ -296,6 +310,7 @@ class SupervisedUserOwnerCreationTest : public SupervisedUserTest {
     cros_settings_provider_.reset(new StubCrosSettingsProvider());
     cros_settings_provider_->Set(kDeviceOwner, base::StringValue(kTestManager));
   }
+
  private:
   scoped_ptr<StubCrosSettingsProvider> cros_settings_provider_;
   DISALLOW_COPY_AND_ASSIGN(SupervisedUserOwnerCreationTest);
@@ -341,4 +356,41 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserOwnerCreationTest,
   RemoveSupervisedUser();
 }
 
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    PRE_PRE_CreateAndCancelSupervisedUser) {
+  PrepareUsers();
+}
+
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    PRE_CreateAndCancelSupervisedUser) {
+  LogInAsManagerAndFillUserData();
+
+  EXPECT_CALL(*mock_async_method_caller_, AsyncMount(_, _, _, _))
+      .Times(1);
+  EXPECT_CALL(*mock_async_method_caller_, AsyncGetSanitizedUsername(_, _))
+      .Times(1);
+  EXPECT_CALL(*mock_async_method_caller_, AsyncAddKey(_, _, _, _))
+      .Times(1);
+
+  JSEval("$('managed-user-creation-next-button').click()");
+
+  testing::Mock::VerifyAndClearExpectations(mock_async_method_caller_);
+
+  EXPECT_TRUE(registration_utility_stub_->register_was_called());
+  EXPECT_EQ(registration_utility_stub_->display_name(),
+            UTF8ToUTF16(kSupervisedUserDisplayName));
+
+  std::string user_id = registration_utility_stub_->managed_user_id();
+  // Make sure user is already in list.
+  ASSERT_EQ(3UL, UserManager::Get()->GetUsers().size());
+  // We wait for token now. Press cancel button at this point.
+  JSEval("$('cancel-add-user-button').click()");
+}
+
+IN_PROC_BROWSER_TEST_F(SupervisedUserTransactionCleanupTest,
+    CreateAndCancelSupervisedUser) {
+  // Make sure there is no supervised user in list.
+  ASSERT_EQ(2UL, UserManager::Get()->GetUsers().size());
+}
+
 }  // namespace chromeos