Fix Profile* lifetime issues in Chrome's AppListViewDelegate

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"
 #include "base/prefs/testing_pref_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/browser/ui/app_list/app_list_service.h"
 #include "chrome/browser/ui/app_list/app_list_service_impl.h"
 #include "chrome/browser/ui/app_list/test/fake_profile.h"
 #include "chrome/browser/ui/app_list/test/fake_profile_store.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestingAppListServiceImpl : public AppListServiceImpl {
  public:
   TestingAppListServiceImpl(const CommandLine& command_line,
                             PrefService* local_state,
                             scoped_ptr<ProfileStore> profile_store)
       : AppListServiceImpl(command_line, local_state, profile_store.Pass()),
-        showing_for_profile_(NULL) {}
+        showing_for_profile_(NULL),
+        destroy_app_list_call_count_(0) {}
 
   Profile* showing_for_profile() const {
     return showing_for_profile_;
   }
 
+  int destroy_app_list_call_count() const {
+    return destroy_app_list_call_count_;
+  }
+
   void PerformStartupChecks(Profile* profile) {
     AppListServiceImpl::PerformStartupChecks(profile);
   }
 
+  // AppListService overrides:
   virtual Profile* GetCurrentAppListProfile() OVERRIDE {
     // We don't return showing_for_profile_ here because that is only defined if
     // the app list is visible.
     return NULL;
   }
 
   virtual void CreateForProfile(Profile* requested_profile) OVERRIDE {
   }
 
   virtual void ShowForProfile(Profile* requested_profile) OVERRIDE {
@@ skipping 10 matching lines @@
   }
 
   virtual gfx::NativeWindow GetAppListWindow() OVERRIDE {
     return NULL;
   }
 
   virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE {
     return NULL;
   }
 
+  // AppListServiceImpl overrides:
+  virtual void DestroyAppList() OVERRIDE { ++destroy_app_list_call_count_; }
+
  private:
   Profile* showing_for_profile_;
+  int destroy_app_list_call_count_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestingAppListServiceImpl);
 };
 
 class AppListServiceUnitTest : public testing::Test {
  public:
   AppListServiceUnitTest() {}
 
   virtual void SetUp() OVERRIDE {
     SetupWithCommandLine(CommandLine(CommandLine::NO_PROGRAM));
   }
 
@@ skipping 57 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());
 }
 
 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));
 }