[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/profiles/profile_list_desktop_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/profiles/profile_list_desktop.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 208 matching lines @@
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(ASCIIToUTF16(name2), item2.name);
 
   // Change name of the first profile, to trigger resorting of the profiles:
   // now the first model should be named "beta", and the second be "gamma".
   manager()->profile_info_cache()->SetNameOfProfileAtIndex(0,
         ASCIIToUTF16(newname1));
   const AvatarMenu::Item& item1next = model->GetItemAt(0);
-  EXPECT_GT(change_count(), 1);
+  EXPECT_EQ(1, change_count());
   EXPECT_EQ(0U, item1next.menu_index);
   EXPECT_EQ(ASCIIToUTF16(name2), item1next.name);
 
   const AvatarMenu::Item& item2next = model->GetItemAt(1);
   EXPECT_EQ(1U, item2next.menu_index);
   EXPECT_EQ(ASCIIToUTF16(newname1), item2next.name);
 }
 
 TEST_F(ProfileListDesktopTest, ChangeOnNotify) {
   manager()->CreateTestingProfile("Test 1");
   manager()->CreateTestingProfile("Test 2");
 
   AvatarMenu* model = GetAvatarMenu();
   EXPECT_EQ(0, change_count());
   EXPECT_EQ(2U, model->GetNumberOfItems());
 
   manager()->CreateTestingProfile("Test 3");
 
-  // 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.
+  // Three changes happened via the call to CreateTestingProfile: adding the
+  // profile to the cache, setting the user name (which rebuilds the list of
+  // profiles after the name change) and changing the avatar.
   // On Windows, an extra change happens to set the shortcut name for the
   // profile.
-  // TODO(michaelpg): Determine why five changes happen on ChromeOS and
-  // investigate other platforms.
-  EXPECT_GE(change_count(), 4);
+  EXPECT_GE(3, change_count());
   ASSERT_EQ(3U, model->GetNumberOfItems());
 
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_EQ(0U, item1.menu_index);
   EXPECT_EQ(ASCIIToUTF16("Test 1"), item1.name);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(1U, item2.menu_index);
   EXPECT_EQ(ASCIIToUTF16("Test 2"), item2.name);
 
@@ skipping 88 matching lines @@
   base::string16 supervised_user_label =
       l10n_util::GetStringUTF16(IDS_SUPERVISED_USER_AVATAR_LABEL);
   const AvatarMenu::Item& item1 = model->GetItemAt(0);
   EXPECT_NE(item1.sync_state, supervised_user_label);
 
   const AvatarMenu::Item& item2 = model->GetItemAt(1);
   EXPECT_EQ(item2.sync_state, supervised_user_label);
 }
 
 }  // namespace