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

content/browser/cert_store.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 "content/browser/cert_store.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/stl_util.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
 template <typename T>
 struct MatchSecond {
   explicit MatchSecond(const T& t) : value(t) {}
 
   template<typename Pair>
   bool operator()(const Pair& p) const {
     return (value == p.second);
   }
   T value;
 };
 
 //  static
 CertStore* CertStore::GetInstance() {
   return Singleton<CertStore>::get();
 }
 
 CertStore::CertStore() : next_cert_id_(1) {
   // We watch for RenderProcess termination, as this is how we clear
   // certificates for now.
   // TODO(jcampan): we should be listening to events such as resource cached/
   //                removed from cache, and remove the cert when we know it
   //                is not used anymore.
 
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_TERMINATED,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
   registrar_.Add(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
-                 NotificationService::AllBrowserContextsAndSources());
+                 content::NotificationService::AllBrowserContextsAndSources());
 }
 
 CertStore::~CertStore() {
 }
 
 int CertStore::StoreCert(net::X509Certificate* cert, int process_id) {
   DCHECK(cert);
   base::AutoLock autoLock(cert_lock_);
 
   int cert_id;
@@ skipping 85 matching lines @@
 
 void CertStore::Observe(int type,
                         const content::NotificationSource& source,
                         const content::NotificationDetails& details) {
   DCHECK(type == content::NOTIFICATION_RENDERER_PROCESS_TERMINATED ||
          type == content::NOTIFICATION_RENDERER_PROCESS_CLOSED);
   RenderProcessHost* rph = content::Source<RenderProcessHost>(source).ptr();
   DCHECK(rph);
   RemoveCertsForRenderProcesHost(rph->id());
 }