Moving notification types which are chrome specific to a new header file chrome_notification_type...

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"
@@ skipping 46 matching lines @@
 // This class observes and collects user action notifications that are sent
 // by the tests, so that they can be examined afterwards for correctness.
 class UserActionObserver : public NotificationObserver {
  public:
   UserActionObserver();
 
   void ValidateUserActions(const Extension* extension,
                            const RecordedUserAction* recorded,
                            int count);
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   typedef std::map<std::string, int> UserActionCountMap;
 
   int num_metrics() const {
     return count_map_.size();
   }
 
   int GetMetricCount(const std::string& name) const {
     UserActionCountMap::const_iterator i = count_map_.find(name);
     return i == count_map_.end() ? -1 : i->second;
   }
 
   NotificationRegistrar registrar_;
   UserActionCountMap count_map_;
 };
 
 UserActionObserver::UserActionObserver() {
-  registrar_.Add(this, NotificationType::USER_ACTION,
+  registrar_.Add(this, content::NOTIFICATION_USER_ACTION,
                  NotificationService::AllSources());
 }
 
-void UserActionObserver::Observe(NotificationType type,
+void UserActionObserver::Observe(int type,
                                  const NotificationSource& source,
                                  const NotificationDetails& details) {
   const char* name = *Details<const char*>(details).ptr();
   ++(count_map_[name]);
 }
 
 void UserActionObserver::ValidateUserActions(const Extension* extension,
                                              const RecordedUserAction* recorded,
                                              int count) {
   EXPECT_EQ(count, num_metrics());
@@ skipping 44 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));
 }