Fixing background mode manager to correctly display the name of the profile in the status icon. P...

chrome/browser/background/background_mode_manager_unittest.cc

 // Copyright (c) 2011 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/memory/scoped_ptr.h"
+#include "base/utf_string_conversions.h"
 #include "chrome/browser/background/background_mode_manager.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class BackgroundModeManagerTest : public testing::Test {
@@ skipping 224 matching lines @@
   manager.SetBackgroundAppCountForProfile(0);
   manager.OnApplicationListChanged(profile2);
 
   size_t p2_index = cache->GetIndexOfProfileWithPath(profile1->GetPath());
   EXPECT_FALSE(cache->GetBackgroundStatusOfProfileAtIndex(p2_index));
 
   // Even though neither has background status on, there should still be two
   // profiles in the cache.
   EXPECT_EQ(2u, cache->GetNumberOfProfiles());
 }
+TEST_F(BackgroundModeManagerTest, ProfileInfoCacheObserver) {
+  TestingProfile* profile1 = profile_manager_.CreateTestingProfile("p1");
+  TestBackgroundModeManager manager(
+      command_line_.get(), profile_manager_.profile_info_cache());
+  manager.RegisterProfile(profile1);
+  EXPECT_FALSE(BrowserList::WillKeepAlive());
+
+  ProfileInfoCache* cache = profile_manager_.profile_info_cache();
+
+  // Install app, should show status tray icon.
+  manager.OnBackgroundAppInstalled(NULL);
+  manager.SetBackgroundAppCount(1);
+  manager.SetBackgroundAppCountForProfile(1);
+  manager.OnApplicationListChanged(profile1);
+
+  string16 p1name = cache->GetNameOfProfileAtIndex(0);
+  manager.OnProfileNameChanged(p1name, UTF8ToUTF16("p1new"));
+
+  EXPECT_EQ(UTF8ToUTF16("p1new"), manager.BackgroundModeDataName(profile1));
+
+  TestingProfile* profile2 = profile_manager_.CreateTestingProfile("p2");
+  manager.RegisterProfile(profile2);
+  EXPECT_EQ(2, manager.NumberOfBackgroundModeData());
+
+  manager.OnProfileAdded(UTF8ToUTF16("p2new"),
+                         profile2->GetPath().BaseName().LossyDisplayName());
+  EXPECT_EQ(UTF8ToUTF16("p2new"), manager.BackgroundModeDataName(profile2));
+
+  manager.OnProfileRemoved(UTF8ToUTF16("p2new"));
+  EXPECT_EQ(1, manager.NumberOfBackgroundModeData());

[Andrew T Wilson (Slow), 2011/12/06 06:46:02]

I like this test - it covers all the cases. One minor suggestion - one more
thing you could check is to ensure that the correct BackgroundModeData() was
removed via the call to OnProfileRemoved():

EXPECT_EQ(UTF8ToUTF16("p1new"), manager.BackgroundModeDataName(profile1));

If you paired this with my suggested DCHECK() in BackgroundModeDataName() to
ensure the profile already exists in the map, it would ensure that the expected
BMD remains in the map.

[rpetterson, 2011/12/06 20:09:05]

That's a good idea. Done.

+}