Revert of Multiprofile: switch to newly added user to the session

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

 // Copyright (c) 2013 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.
 
 // Browser test for basic Chrome OS file manager functionality:
 //  - The file list is updated when a file is added externally to the Downloads
 //    folder.
 //  - Selecting a file and copy-pasting it with the keyboard copies the file.
 //  - Selecting a file and pressing delete deletes it.
 
@@ skipping 897 matching lines @@
                                     kTestAccounts[DUMMY_ACCOUNT_INDEX].email);
     command_line->AppendSwitchASCII(chromeos::switches::kLoginProfile,
                                     kTestAccounts[DUMMY_ACCOUNT_INDEX].hash);
   }
 
   // Logs in to the primary profile of this test.
   virtual void SetUpOnMainThread() OVERRIDE {
     const TestAccountInfo& info = kTestAccounts[PRIMARY_ACCOUNT_INDEX];
 
     AddUser(info, true);
+    chromeos::UserManager* const user_manager = chromeos::UserManager::Get();
+    if (user_manager->GetActiveUser() != user_manager->FindUser(info.email))
+      chromeos::UserManager::Get()->SwitchActiveUser(info.email);
     FileManagerBrowserTestBase::SetUpOnMainThread();
   }
 
   // Loads all users to the current session and sets up necessary fields.
   // This is used for preparing all accounts in PRE_ test setup, and for testing
   // actual login behavior.
   void AddAllUsers() {
     for (size_t i = 0; i < arraysize(kTestAccounts); ++i)
       AddUser(kTestAccounts[i], i >= SECONDARY_ACCOUNT_INDEX_START);
   }
@@ skipping 129 matching lines @@
   // (bob and charlie) are added in the test. Thus the existing test verifies
   // that the feature is effectively working with lastly logged in users.
   AddExtraUsersForStressTesting();
 
   set_test_case_name("multiProfileVisitDesktopMenu");
   StartTest();
 }
 
 }  // namespace
 }  // namespace file_manager