Move ownership of the AppListViewDelegate into the AppListService

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 139 matching lines @@
   base::FilePath initial_profile_path =
       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();
-  EXPECT_EQ(0, service_->destroy_app_list_call_count());
   profile_store_->RemoveProfile(profile1_.get());
 
   base::FilePath last_used_profile_path =
       user_data_dir_.AppendASCII("last-used");
   EXPECT_EQ(last_used_profile_path,
             service_->GetProfilePath(profile_store_->GetUserDataDir()));
 
-  // Ensure a tear-down was triggered, since there would be references to the
-  // destroyed Profile, and the last-used profile could be getting loaded
-  // asynchronously.
-  EXPECT_EQ(1, service_->destroy_app_list_call_count());
+  // 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());
 }
 
 TEST_F(AppListServiceUnitTest, SwitchingProfilesPersists) {
   profile_store_->LoadProfile(profile1_.get());
   profile_store_->LoadProfile(profile2_.get());
   EnableAppList();
   service_->SetProfilePath(profile2_->GetPath());
   service_->Show();
   EXPECT_EQ(profile2_.get(), service_->showing_for_profile());
   EXPECT_EQ(profile2_->GetPath(),
@@ skipping 61 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_->AutoShowForProfile(profile1_.get());
   EXPECT_EQ(AppListService::ENABLE_SHOWN_UNDISCOVERED,
             local_state_->GetInteger(prefs::kAppListEnableMethod));
 }