Merge 115621 - Refactor ProfileInfoCacheObserver interface and usage thereof.

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"
@@ skipping 240 matching lines @@
   // 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"));
+  manager.OnProfileNameChanged(
+      profile1->GetPath(),
+      manager.GetBackgroundModeData(profile1)->name());
 
-  EXPECT_EQ(UTF8ToUTF16("p1new"),
+  EXPECT_EQ(UTF8ToUTF16("p1"),
             manager.GetBackgroundModeData(profile1)->name());
 
   TestingProfile* profile2 = profile_manager_.CreateTestingProfile("p2");
   manager.RegisterProfile(profile2);
   EXPECT_EQ(2, manager.NumberOfBackgroundModeData());
 
-  gfx::Image gaia_image(gfx::test::CreateImage());
-  manager.OnProfileAdded(UTF8ToUTF16("p2new"),
-                         profile2->GetPath().BaseName().LossyDisplayName(),
-                         profile2->GetPath(),
-                         &gaia_image);
-  EXPECT_EQ(UTF8ToUTF16("p2new"),
+  manager.OnProfileAdded(profile2->GetPath());
+  EXPECT_EQ(UTF8ToUTF16("p2"),
             manager.GetBackgroundModeData(profile2)->name());
 
-  manager.OnProfileWillBeRemoved(UTF8ToUTF16("p2new"));
+  manager.OnProfileWillBeRemoved(profile2->GetPath());
   EXPECT_EQ(1, manager.NumberOfBackgroundModeData());
 
   // Check that the background mode data we think is in the map actually is.
-  EXPECT_EQ(UTF8ToUTF16("p1new"),
+  EXPECT_EQ(UTF8ToUTF16("p1"),
             manager.GetBackgroundModeData(profile1)->name());
 }