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

chrome/browser/download/download_crx_util.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.
 //
 // Download code which handles CRX files (extensions, themes, apps, ...).
 
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/browser/download/download_item.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace download_crx_util {
 
 namespace {
 
 // Hold a mock ExtensionInstallUI object that will be used when the
 // download system opens a CRX.
 ExtensionInstallUI* mock_install_ui_for_testing = NULL;
 
 // Called to get an extension install UI object.  In tests, will return
@@ skipping 21 matching lines @@
   mock_install_ui_for_testing = mock_ui;
 }
 
 scoped_refptr<CrxInstaller> OpenChromeExtension(
     Profile* profile,
     const DownloadItem& download_item) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ExtensionService* service = profile->GetExtensionService();
   CHECK(service);
-  NotificationService* nservice = NotificationService::current();
+  content::NotificationService* nservice =
+      content::NotificationService::current();
   GURL nonconst_download_url = download_item.GetURL();
   nservice->Notify(chrome::NOTIFICATION_EXTENSION_READY_FOR_INSTALL,
                    content::Source<Profile>(profile),
                    content::Details<GURL>(&nonconst_download_url));
 
   scoped_refptr<CrxInstaller> installer(
       service->MakeCrxInstaller(CreateExtensionInstallUI(profile)));
   installer->set_delete_source(true);
 
   if (UserScript::IsURLUserScript(download_item.GetURL(),
@@ skipping 11 matching lines @@
       installer->set_original_download_url(download_item.original_url());
     installer->set_allow_silent_install(is_gallery_download);
     installer->set_install_cause(extension_misc::INSTALL_CAUSE_USER_DOWNLOAD);
     installer->InstallCrx(download_item.full_path());
   }
 
   return installer;
 }
 
 }  // namespace download_crx_util