Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome/browser/profiles/avatar_menu_model.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 "chrome/browser/profiles/avatar_menu_model.h"
 
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/avatar_menu_model_observer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/url_constants.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/image/image.h"
 
 namespace {
 
 class ProfileSwitchObserver : public ProfileManagerObserver {
  public:
   virtual void OnProfileCreated(Profile* profile, Status status) OVERRIDE {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 15 matching lines @@
                                  Browser* browser)
     : profile_info_(profile_cache),
       observer_(observer),
       browser_(browser) {
   DCHECK(profile_info_);
   DCHECK(observer_);
   // Don't DCHECK(browser_) so that unit tests can reuse this ctor.
 
   // Register this as an observer of the info cache.
   registrar_.Add(this, chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
-      NotificationService::AllSources());
+      content::NotificationService::AllSources());
 
   // Build the initial menu.
   RebuildMenu();
 }
 
 AvatarMenuModel::~AvatarMenuModel() {
   ClearMenu();
 }
 
 AvatarMenuModel::Item::Item(size_t model_index, const gfx::Image& icon)
@@ skipping 72 matching lines @@
       item->active = browser_->profile()->GetPath() == path;
     }
     items_.push_back(item);
   }
 }
 
 void AvatarMenuModel::ClearMenu() {
   STLDeleteContainerPointers(items_.begin(), items_.end());
   items_.clear();
 }