Always load signin profile on Chrome OS startup.

chrome/browser/profiles/profile_manager_browsertest.cc

 // Copyright (c) 2012 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 "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_store_factory.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 247 matching lines @@
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 2U);
 
   // Now close all browser windows.
   std::vector<Profile*> profiles = profile_manager->GetLoadedProfiles();
   for (std::vector<Profile*>::const_iterator it = profiles.begin();
        it != profiles.end(); ++it) {
     BrowserList::CloseAllBrowsersWithProfile(*it);
   }
 }
 
+base::FilePath GetNonSigninProfileAt(ProfileInfoCache& cache, size_t index) {

[mtomasz, 2015/02/18 03:13:06]

ProfileInfoCache& -> const ProfileInfoCache&

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

+  base::FilePath result;
+  size_t i, idx = 0, profile_num = cache.GetNumberOfProfiles();

[mtomasz, 2015/02/18 03:13:06]

We have here i, idx, index. It's really difficult to understand. Can we use
better naming?

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

+  for (i = 0; i != profile_num; ++i) {
+    base::FilePath path = cache.GetPathOfProfileAtIndex(i);
+#if defined(OS_CHROMEOS)
+    if (path.BaseName().value() == chrome::kInitialProfile)
+      continue;
+#endif
+    if (idx == index)

[Mr4D (OOO till 08-26), 2015/02/17 15:46:51]

You could do a "idx++" here to eliminate line 279.

Nit: You might then use != in 274 and remove the continue.

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

+      return path;
+    ++idx;
+  }
+  return result;
+}
+
 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest,
                        SwitchToProfile) {
 #if defined(OS_WIN) && defined(USE_ASH)
   // Disable this test in Metro+Ash for now (http://crbug.com/262796).
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAshBrowserTests))
     return;
 #endif
 
   // If multiprofile mode is not enabled, you can't switch between profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
-  base::FilePath path_profile1 = cache.GetPathOfProfileAtIndex(0);
+  unsigned int initial_profile_count = profile_manager->GetNumberOfProfiles();

[mtomasz, 2015/02/18 03:13:07]

Is number of profiles "unsigned int" or "size_t"? See #270 vs. #299.

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

+  base::FilePath path_profile1 = GetNonSigninProfileAt(cache, 0);
 
-  ASSERT_EQ(profile_manager->GetNumberOfProfiles(), 1U);
+  ASSERT_NE(initial_profile_count, 0U);

[mtomasz, 2015/02/18 03:13:06]

Opposite argument order. Should be:
ASSERT(expected, actual)
EXPECT(expected, actual)

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
 
   // Create an additional profile.
   base::FilePath path_profile2 =
       profile_manager->GenerateNextProfileDirectoryPath();
   profile_manager->CreateProfileAsync(path_profile2,
                                       base::Bind(&OnUnblockOnProfileCreation),
                                       base::string16(), base::string16(),
                                       std::string());
 
   // Spin to allow profile creation to take place, loop is terminated
   // by OnUnblockOnProfileCreation when the profile is created.
   content::RunMessageLoop();
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   BrowserList* browser_list = BrowserList::GetInstance(desktop_type);
-  ASSERT_EQ(cache.GetNumberOfProfiles(), 2U);
+  ASSERT_EQ(cache.GetNumberOfProfiles(), initial_profile_count + 1);
   EXPECT_EQ(1U, browser_list->size());
 
   // Open a browser window for the first profile.
   profiles::SwitchToProfile(path_profile1, desktop_type, false,
                             kOnProfileSwitchDoNothing,
                             ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(chrome::GetTotalBrowserCount(), 1U);
   EXPECT_EQ(1U, browser_list->size());
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
 
@@ skipping 29 matching lines @@
           switches::kAshBrowserTests))
     return;
 #endif
 
   // If multiprofile mode is not enabled, you can't switch between profiles.
   if (!profiles::IsMultipleProfilesEnabled())
     return;
 
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
-  base::FilePath path_profile1 = cache.GetPathOfProfileAtIndex(0);
+  unsigned int initial_profile_count = profile_manager->GetNumberOfProfiles();

[mtomasz, 2015/02/18 03:13:07]

ditto

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

+  base::FilePath path_profile1 = GetNonSigninProfileAt(cache, 0);
 
-  ASSERT_EQ(1U, profile_manager->GetNumberOfProfiles());
+  ASSERT_NE(0U, initial_profile_count);
   EXPECT_EQ(1U, chrome::GetTotalBrowserCount());
 
   // Create an ephemeral profile.
   base::FilePath path_profile2 =
       profile_manager->GenerateNextProfileDirectoryPath();
   profile_manager->CreateProfileAsync(
       path_profile2,
       base::Bind(&EphemeralProfileCreationComplete),
       base::string16(), base::string16(), std::string());
 
   // Spin to allow profile creation to take place.
   content::RunMessageLoop();
 
   chrome::HostDesktopType desktop_type = chrome::GetActiveDesktop();
   BrowserList* browser_list = BrowserList::GetInstance(desktop_type);
-  ASSERT_EQ(2U, cache.GetNumberOfProfiles());
+  ASSERT_EQ(initial_profile_count + 1, cache.GetNumberOfProfiles());
   EXPECT_EQ(1U, browser_list->size());
 
   // Open a browser window for the second profile.
   profiles::SwitchToProfile(path_profile2, desktop_type, false,
                             kOnProfileSwitchDoNothing,
                             ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(2U, chrome::GetTotalBrowserCount());
   EXPECT_EQ(2U, browser_list->size());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
 
   // Create a second window for the ephemeral profile.
   profiles::SwitchToProfile(path_profile2, desktop_type, true,
                             kOnProfileSwitchDoNothing,
                             ProfileMetrics::SWITCH_PROFILE_ICON);
   EXPECT_EQ(3U, chrome::GetTotalBrowserCount());
   EXPECT_EQ(3U, browser_list->size());
 
   EXPECT_EQ(path_profile1, browser_list->get(0)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(1)->profile()->GetPath());
   EXPECT_EQ(path_profile2, browser_list->get(2)->profile()->GetPath());
 
   // Closing the first window of the ephemeral profile should not delete it.
   browser_list->get(2)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(2U, browser_list->size());
-  ASSERT_EQ(2U, cache.GetNumberOfProfiles());
+  ASSERT_EQ(initial_profile_count + 1, cache.GetNumberOfProfiles());
 
   // The second should though.
   browser_list->get(1)->window()->Close();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1U, browser_list->size());
-  ASSERT_EQ(1U, cache.GetNumberOfProfiles());
+  ASSERT_EQ(initial_profile_count, cache.GetNumberOfProfiles());

[mtomasz, 2015/02/18 03:13:06]

This can be EXPECT. AFAIK ASSERT should be used only if continuing would result
in a crash.

[Ivan Podogov, 2015/02/24 11:43:16]

Done.

 }
 
 // The test makes sense on those platforms where the keychain exists.
 #if !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(ProfileManagerBrowserTest, DeletePasswords) {
   Profile* profile = ProfileManager::GetActiveUserProfile();
   ASSERT_TRUE(profile);
 
   autofill::PasswordForm form;
   form.scheme = autofill::PasswordForm::SCHEME_HTML;
@@ skipping 30 matching lines @@
       run_loop.QuitClosure());
   EXPECT_TRUE(password_store->ScheduleTask(task));
   run_loop.Run();
 
   EXPECT_TRUE(verify_add.IsCalled());
   EXPECT_EQ(1u, verify_add.GetPasswords().size());
   EXPECT_TRUE(verify_delete.IsCalled());
   EXPECT_EQ(0u, verify_delete.GetPasswords().size());
 }
 #endif  // !defined(OS_WIN) && !defined(OS_ANDROID) && !defined(OS_CHROMEOS)