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

chrome/browser/extensions/extension_metrics_apitest.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 <map>
 
 #include "base/metrics/histogram.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace {
 
 // The tests that are run by this extension are expected to record the following
 // user actions, with the specified counts.  If the tests in test.js are
 // modified, this array may need to be updated.
 struct RecordedUserAction {
   const char* name;  // base name of metric without extension id.
   int count;  // number of times the metric was recorded.
 } g_user_actions[] = {
@@ skipping 56 matching lines @@
     UserActionCountMap::const_iterator i = count_map_.find(name);
     return i == count_map_.end() ? -1 : i->second;
   }
 
   content::NotificationRegistrar registrar_;
   UserActionCountMap count_map_;
 };
 
 UserActionObserver::UserActionObserver() {
   registrar_.Add(this, content::NOTIFICATION_USER_ACTION,
-                 NotificationService::AllSources());
+                 content::NotificationService::AllSources());
 }
 
 void UserActionObserver::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
   const char* name = *content::Details<const char*>(details).ptr();
   ++(count_map_[name]);
 }
 
 void UserActionObserver::ValidateUserActions(const Extension* extension,
@@ skipping 47 matching lines @@
 
   ASSERT_TRUE(RunExtensionTest("metrics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension);
 
   observer.ValidateUserActions(extension,
                                g_user_actions,
                                arraysize(g_user_actions));
   ValidateHistograms(extension, g_histograms, arraysize(g_histograms));
 }