[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/chromeos/profiles/profile_list_chromeos_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 <string>
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
@@ skipping 209 matching lines @@
 
 TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) {
   base::string16 name1(ASCIIToUTF16("Alpha"));
   base::string16 name2(ASCIIToUTF16("Beta"));
   base::string16 newname1(ASCIIToUTF16("Gamma"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
 
   AvatarMenu* menu = GetAvatarMenu();
-
+  EXPECT_EQ(0, change_count());
   ASSERT_EQ(2U, menu->GetNumberOfItems());
 
   const AvatarMenu::Item& item1 = menu->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(name1, item1.name);
 
   const AvatarMenu::Item& item2 = menu->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(name2, item2.name);
 
   // Change name of the first profile, to trigger resorting of the profiles:
   // now the first menu item should be named "beta", and the second be "gamma".
   GetFakeChromeUserManager()->SaveUserDisplayName(
       base::UTF16ToASCII(name1) + "@example.com", newname1);
   manager()->profile_info_cache()->SetNameOfProfileAtIndex(0, newname1);
+  EXPECT_EQ(1, change_count());
 
   const AvatarMenu::Item& item1next = menu->GetItemAt(0);
-  EXPECT_GT(change_count(), 1);
   EXPECT_EQ(0U, item1next.menu_index);
   EXPECT_EQ(name2, item1next.name);
 
   const AvatarMenu::Item& item2next = menu->GetItemAt(1);
   EXPECT_EQ(1U, item2next.menu_index);
   EXPECT_EQ(newname1, item2next.name);
 }
 
 TEST_F(ProfileListChromeOSTest, ChangeOnNotify) {
   base::string16 name1(ASCIIToUTF16("p1.com"));
   base::string16 name2(ASCIIToUTF16("p2.com"));
 
   AddProfile(name1, true);
   AddProfile(name2, true);
 
   AvatarMenu* menu = GetAvatarMenu();
   EXPECT_EQ(2U, menu->GetNumberOfItems());
+  EXPECT_EQ(0, change_count());
 
   base::string16 name3(ASCIIToUTF16("p3.com"));
   AddProfile(name3, true);
 
-  // Four changes happened via the call to CreateTestingProfile: adding the
-  // profile to the cache, setting the user name, rebuilding the list of
-  // profiles after the name change, and changing the avatar.
-  // TODO(michaelpg): Determine why actual change number does not match comment.
-  EXPECT_GE(change_count(), 4);
+  // Three changes happened via the call to CreateTestingProfile: adding the
+  // profile to the cache, setting the user name (which rebuilt the list of
+  // profiles after the name change), and changing the avatar.
+  EXPECT_EQ(change_count(), 3);
   ASSERT_EQ(3U, menu->GetNumberOfItems());
 
   const AvatarMenu::Item& item1 = menu->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(name1, item1.name);
 
   const AvatarMenu::Item& item2 = menu->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(name2, item2.name);
 
@@ skipping 11 matching lines @@
 
   // Should only show avatar menu with multiple users.
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 
   AddProfile(name2, false);
 
   EXPECT_FALSE(AvatarMenu::ShouldShowAvatarMenu());
 }
 
 }  // namespace chromeos