Fixed AppListServceUnitTest so it tests what it says it's testing.

chrome/browser/ui/app_list/app_list_service_unittest.cc

 // Copyright 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.
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
@@ skipping 68 matching lines @@
  public:
   AppListServiceUnitTest() {}
 
   void SetUp() override {
     SetupWithCommandLine(base::CommandLine(base::CommandLine::NO_PROGRAM));
   }
 
  protected:
   void SetupWithCommandLine(const base::CommandLine& command_line) {
     user_data_dir_ = base::FilePath(FILE_PATH_LITERAL("udd"));
-    initial_profile_ = "ip";
     profile1_.reset(
         new FakeProfile("p1", user_data_dir_.AppendASCII("profile1")));
     profile2_.reset(
         new FakeProfile("p2", user_data_dir_.AppendASCII("profile2")));
     PrefRegistrySimple* pref_registry = new PrefRegistrySimple;
 
     AppListService::RegisterPrefs(pref_registry);
     profiles::RegisterPrefs(pref_registry);
 
     base::PrefServiceFactory factory;
     factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore));
     local_state_ = factory.Create(pref_registry).Pass();
 
-    profile_store_ = new FakeProfileStore(user_data_dir_, initial_profile_);
+    profile_store_ = new FakeProfileStore(user_data_dir_, local_state_.get());
     service_.reset(new TestingAppListServiceImpl(
         command_line,
         local_state_.get(),
         scoped_ptr<ProfileStore>(profile_store_)));
   }
 
   void EnableAppList() {
     service_->EnableAppList(profile1_.get(),
                             AppListService::ENABLE_VIA_COMMAND_LINE);
   }
 
   base::FilePath user_data_dir_;
-  std::string initial_profile_;
   scoped_ptr<PrefService> local_state_;
   FakeProfileStore* profile_store_;
   scoped_ptr<TestingAppListServiceImpl> service_;
   scoped_ptr<FakeProfile> profile1_;
   scoped_ptr<FakeProfile> profile2_;
 
   DISALLOW_COPY_AND_ASSIGN(AppListServiceUnitTest);
 };
 
 TEST_F(AppListServiceUnitTest, EnablingStateIsPersisted) {
   EXPECT_FALSE(local_state_->GetBoolean(prefs::kAppLauncherHasBeenEnabled));
   EnableAppList();
   EXPECT_TRUE(local_state_->GetBoolean(prefs::kAppLauncherHasBeenEnabled));
   EXPECT_EQ(profile1_->GetPath(), user_data_dir_.Append(
       local_state_->GetFilePath(prefs::kAppListProfile)));
 }
 
 TEST_F(AppListServiceUnitTest, ShowingForProfileLoadsAProfile) {
   profile_store_->LoadProfile(profile1_.get());
   EnableAppList();
   service_->Show();
   EXPECT_EQ(profile1_.get(), service_->showing_for_profile());
   EXPECT_TRUE(service_->IsAppListVisible());
 }
 
 TEST_F(AppListServiceUnitTest, RemovedProfileResetsToInitialProfile) {
   EnableAppList();
   profile_store_->RemoveProfile(profile1_.get());
+
+  // kAppListProfile should have been cleared, and therefore GetProfilePath
+  // should return the initial profile.
+  EXPECT_EQ("", local_state_->GetString(prefs::kAppListProfile));
   base::FilePath initial_profile_path =
-      user_data_dir_.AppendASCII(initial_profile_);
+      user_data_dir_.AppendASCII(chrome::kInitialProfile);
   EXPECT_EQ(initial_profile_path,
             service_->GetProfilePath(profile_store_->GetUserDataDir()));
 }
 
 TEST_F(AppListServiceUnitTest,
        RemovedProfileResetsToLastUsedProfileIfExists) {
   local_state_->SetString(prefs::kProfileLastUsed, "last-used");
   EnableAppList();
   profile_store_->RemoveProfile(profile1_.get());
 
+  // kAppListProfile should have been set to kProfileLastUsed.
+  EXPECT_EQ("last-used", local_state_->GetString(prefs::kAppListProfile));
   base::FilePath last_used_profile_path =
       user_data_dir_.AppendASCII("last-used");
   EXPECT_EQ(last_used_profile_path,
             service_->GetProfilePath(profile_store_->GetUserDataDir()));
 
   // For this test, the AppListViewDelegate is not created because the
   // app list is never shown, so there is nothing to destroy.
   EXPECT_EQ(0, service_->destroy_app_list_call_count());
 }
 
@@ skipping 69 matching lines @@
   EXPECT_EQ(AppListService::ENABLE_FOR_APP_INSTALL,
             local_state_->GetInteger(prefs::kAppListEnableMethod));
   EXPECT_NE(0, local_state_->GetInt64(prefs::kAppListEnableTime));
 
   // An auto-show here should update the enable method to prevent recording it
   // as ENABLE_FOR_APP_INSTALL.
   service_->ShowForAppInstall(profile1_.get(), "", false);
   EXPECT_EQ(AppListService::ENABLE_SHOWN_UNDISCOVERED,
             local_state_->GetInteger(prefs::kAppListEnableMethod));
 }