[Profiles] Remove the NotificationService from the ProfileInfoCache

chrome/browser/ui/webui/options/options_ui_browsertest.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/ui/webui/options/options_ui_browsertest.h"
 
 #include "base/prefs/pref_service.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 212 matching lines @@
   EXPECT_TRUE(result);
 
   base::FilePath profile_dir = browser()->profile()->GetPath();
   ProfileInfoCache& profile_info_cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
 
   EXPECT_TRUE(DirectoryExists(profile_dir));
   EXPECT_TRUE(profile_info_cache.GetIndexOfProfileWithPath(profile_dir) !=
               std::string::npos);
 
-  content::WindowedNotificationObserver wait_for_profile_deletion(
-      chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-      content::NotificationService::AllSources());
-
   // TODO(kaliamoorthi): Get the macos problem fixed and remove this code.
   // Deleting the Profile also destroys all browser windows of that Profile.
   // Wait for the current browser to close before resuming, otherwise
   // the browser_tests shutdown code will be confused on the Mac.
   content::WindowedNotificationObserver wait_for_browser_closed(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::NotificationService::AllSources());
 
   ASSERT_TRUE(content::ExecuteScript(
       browser()->tab_strip_model()->GetActiveWebContents(),
       "$('disconnect-managed-profile-ok').click();"));
 
-  wait_for_profile_deletion.Wait();
-
   EXPECT_TRUE(profile_info_cache.GetIndexOfProfileWithPath(profile_dir) ==
               std::string::npos);
 
   wait_for_browser_closed.Wait();
 }
 
 IN_PROC_BROWSER_TEST_F(OptionsUIBrowserTest, VerifyUnmanagedSignout) {
   SigninManager* signin =
       SigninManagerFactory::GetForProfile(browser()->profile());
   const std::string user = "test@example.com";
@@ skipping 69 matching lines @@
   run_loop.Run();
 
   // Verify that the settings page has updated and lists two profiles.
   ASSERT_TRUE(content::ExecuteScriptAndExtractInt(
       contents, javascript, &profiles));
   EXPECT_EQ(2, profiles);
 }
 #endif
 
 }  // namespace options