Create LoadProfile method in profile_manager

chrome/browser/profiles/profile_manager_unittest.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 <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 75 matching lines @@
                                     Delegate* delegate) override {
     // This is safe while all file operations are done on the FILE thread.
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(base::IgnoreResult(&base::CreateDirectory), path));
 
     return new TestingProfile(path, this);
   }
 };
 
+void ExpectNullProfile(Profile* profile) {

[Bernhard Bauer, 2016/03/14 19:05:34]

Can you make this take an additional Closure to run and then pass in a
QuitClosure from the RunLoop? That way you actually know that this method is
called (and I don't really like relying on RunUntilIdle).

[Miguel Garcia, 2016/03/17 20:04:07]

I will look into this and fix it before submitting. Feel free to LGTM pending
this change. Just wanted to make sure it can go through a second round of
comments today.

+  EXPECT_EQ(nullptr, profile);
+}
+
+void ExpectProfileWithName(const std::string& profile_name,
+                           bool incognito,
+                           Profile* profile) {
+  EXPECT_NE(nullptr, profile);
+  EXPECT_EQ(incognito, profile->IsOffTheRecord());
+  if (!incognito) {

[Bernhard Bauer, 2016/03/14 19:05:34]

For incognito profiles, you could verify the name of the original profile.

[Miguel Garcia, 2016/03/17 20:04:07]

Good idea!

+#if defined(OS_WIN)
+    EXPECT_EQ(base::ASCIIToUTF16(profile_name),

[Bernhard Bauer, 2016/03/14 19:05:34]

Alternatively, use FilePath().AppendASCII(profile_name)? Having to create an
empty FilePath isn't super elegant either, but it avoids the platform #ifdef
(which is even more ick IMO).

(Really, FilePath should have a FromASCII() method.)

[Miguel Garcia, 2016/03/17 20:04:07]

Agreed. Done

+              profile->GetPath().BaseName().value());
+#else
+    EXPECT_EQ(profile_name, profile->GetPath().BaseName().value());
+#endif
+  }
+}
+
 }  // namespace
 
 class ProfileManagerTest : public testing::Test {
  protected:
   class MockObserver {
    public:
     MOCK_METHOD2(OnProfileCreated,
         void(Profile* profile, Profile::CreateStatus status));
   };
 
@@ skipping 180 matching lines @@
 
   // Make sure any pending tasks run before we destroy the profiles.
     base::RunLoop().RunUntilIdle();
 
   TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
 
   // Make sure history cleans up correctly.
   base::RunLoop().RunUntilIdle();
 }
 
+TEST_F(ProfileManagerTest, LoadProfileDoesNotExist) {

[Bernhard Bauer, 2016/03/14 19:05:34]

Nit: "LoadNonExistingProfile" (and "LoadExistingProfile" below)?

[Miguel Garcia, 2016/03/17 20:04:07]

Done.

+  const std::string profile_name = "NonExistingProfile";
+
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  profile_manager->LoadProfile(profile_name, false /* incognito */,
+                               base::Bind(&ExpectNullProfile));
+  base::RunLoop().RunUntilIdle();
+  profile_manager->LoadProfile(profile_name, true /* incognito */,
+                               base::Bind(&ExpectNullProfile));
+  base::RunLoop().RunUntilIdle();
+}
+
+TEST_F(ProfileManagerTest, LoadProfileExisting) {
+  const std::string profile_name = "MyProfile";
+  const std::string other_name = "SomeOtherProfile";
+  MockObserver mock_observer1;
+  EXPECT_CALL(mock_observer1, OnProfileCreated(SameNotNull(), NotFail()))
+      .Times(testing::AtLeast(1));
+
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  CreateProfileAsync(profile_manager, profile_name, false, &mock_observer1);
+
+  // Make sure a real profile is created before continuing.
+  base::RunLoop().RunUntilIdle();
+
+  bool incognito = false;
+  profile_manager->LoadProfile(
+      profile_name, incognito,
+      base::Bind(&ExpectProfileWithName, profile_name, incognito));
+
+  incognito = true;
+  profile_manager->LoadProfile(
+      profile_name, incognito,
+      base::Bind(&ExpectProfileWithName, profile_name, incognito));
+
+  // Loading some other non existing profile should still return null.
+  profile_manager->LoadProfile(other_name, false,
+                               base::Bind(&ExpectNullProfile));
+  base::RunLoop().RunUntilIdle();
+}
+
 TEST_F(ProfileManagerTest, CreateProfileAsyncMultipleRequests) {
   g_created_profile = NULL;
 
   MockObserver mock_observer1;
   EXPECT_CALL(mock_observer1, OnProfileCreated(
       SameNotNull(), NotFail())).Times(testing::AtLeast(1));
   MockObserver mock_observer2;
   EXPECT_CALL(mock_observer2, OnProfileCreated(
       SameNotNull(), NotFail())).Times(testing::AtLeast(1));
   MockObserver mock_observer3;
@@ skipping 1033 matching lines @@
                          dest_path2.BaseName().MaybeAsASCII());
   profile_manager->ScheduleProfileForDeletion(dest_path2,
                                               ProfileManager::CreateCallback());
   // Spin the message loop so that all the callbacks can finish running.
   base::RunLoop().RunUntilIdle();
 
   EXPECT_EQ(dest_path3, profile_manager->GetLastUsedProfile()->GetPath());
   EXPECT_EQ(profile_name3, local_state->GetString(prefs::kProfileLastUsed));
 }
 #endif  // !defined(OS_MACOSX)