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

chrome/browser/tabs/tab_finder.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/tabs/tab_finder.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/browser/tab_contents/navigation_details.h"
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/common/page_transition_types.h"
 
 class TabFinder::TabContentsObserverImpl : public TabContentsObserver {
  public:
   TabContentsObserverImpl(TabContents* tab, TabFinder* finder);
   virtual ~TabContentsObserverImpl();
 
@@ skipping 84 matching lines @@
                         const content::NotificationDetails& details) {
   DCHECK_EQ(type, content::NOTIFICATION_TAB_PARENTED);
 
   // The tab was added to a browser. Query for its state now.
   TabContentsWrapper* tab = content::Source<TabContentsWrapper>(source).ptr();
   TrackTab(tab->tab_contents());
 }
 
 TabFinder::TabFinder() {
   registrar_.Add(this, content::NOTIFICATION_TAB_PARENTED,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 TabFinder::~TabFinder() {
   STLDeleteElements(&tab_contents_observers_);
 }
 
 void TabFinder::DidNavigateAnyFramePostCommit(
     TabContents* source,
     const content::LoadCommittedDetails& details,
     const ViewHostMsg_FrameNavigate_Params& params) {
@@ skipping 91 matching lines @@
                                          GURL url,
                                          bool success,
                                          history::RedirectList* redirects) {
   if (success && !redirects->empty()) {
     TabContents* tab_contents =
         callback_consumer_.GetClientDataForCurrentRequest();
     DCHECK(tab_contents);
     tab_contents_to_url_[tab_contents] = redirects->back();
   }
 }