Cleanup owners files, histograms, src (-ygorshenin@)

chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc

 // Copyright 2014 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/login/users/multi_profile_user_controller.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
@@ skipping 304 matching lines @@
                 MultiProfileUserController::ALLOWED)
           << "Case " << i;
     } else {
       EXPECT_NE(kBehaviorTestCases[i].expected_secondary_allowed,
                 MultiProfileUserController::ALLOWED)
           << "Case " << i;
     }
   }
 }
 
-// Tests that owner could not be a secondary user.
-//
-// TODO (ygorshenin@, crbug.com/230018): remove or change the test when the
-// issue will be fixed.
-TEST_F(MultiProfileUserControllerTest, DISABLED_NoSecondaryOwner) {
-  LoginUser(0);
-  SetOwner(1);
-
-  MultiProfileUserController::UserAllowedInSessionReason reason;
-  EXPECT_FALSE(controller()->IsUserAllowedInSession(kUsers[1], &reason));
-  EXPECT_EQ(MultiProfileUserController::NOT_ALLOWED_OWNER_AS_SECONDARY, reason);
-
-  EXPECT_EQ(0, user_not_allowed_count());
-  LoginUser(1);
-  EXPECT_EQ(1, user_not_allowed_count());
-}
-
 TEST_F(MultiProfileUserControllerTest,
        UsedPolicyCertificatesAllowedForPrimary) {
   // Verifies that any user can sign-in as the primary user, regardless of the
   // tainted state.
   policy::PolicyCertServiceFactory::SetUsedPolicyCertificates(kUsers[0]);
   MultiProfileUserController::UserAllowedInSessionReason reason;
   EXPECT_TRUE(controller()->IsUserAllowedInSession(kUsers[0], &reason));
   EXPECT_EQ(MultiProfileUserController::ALLOWED, reason);
   EXPECT_TRUE(controller()->IsUserAllowedInSession(kUsers[1], &reason));
   EXPECT_EQ(MultiProfileUserController::ALLOWED, reason);
@@ skipping 86 matching lines @@
   EXPECT_EQ(MultiProfileUserController::NOT_ALLOWED_PRIMARY_POLICY_CERT_TAINTED,
             reason);
   EXPECT_EQ(MultiProfileUserController::NOT_ALLOWED_PRIMARY_POLICY_CERT_TAINTED,
             MultiProfileUserController::GetPrimaryUserPolicy());
 
   // Flush tasks posted to IO.
   base::RunLoop().RunUntilIdle();
 }
 
 }  // namespace chromeos