Move extension notifications to extensions/browser/notification_types.h

chrome/browser/extensions/extension_apitest.cc

 // Copyright (c) 2012 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/extensions/extension_apitest.h"
 
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "extensions/browser/api/test/test_api.h"
 #include "extensions/browser/extension_system.h"
+#include "extensions/browser/notification_types.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "net/base/escape.h"
 #include "net/base/filename_util.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "net/test/spawned_test_server/spawned_test_server.h"
 
 namespace {
@@ skipping 106 matching lines @@
       base::Bind(&HandleSetCookieRequest));
   embedded_test_server()->RegisterRequestHandler(
       base::Bind(&HandleSetHeaderRequest));
 }
 
 ExtensionApiTest::~ExtensionApiTest() {}
 
 ExtensionApiTest::ResultCatcher::ResultCatcher()
     : profile_restriction_(NULL),
       waiting_(false) {
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_PASSED,
+  registrar_.Add(this,
+                 extensions::NOTIFICATION_EXTENSION_TEST_PASSED,
                  content::NotificationService::AllSources());
-  registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_TEST_FAILED,
+  registrar_.Add(this,
+                 extensions::NOTIFICATION_EXTENSION_TEST_FAILED,
                  content::NotificationService::AllSources());
 }
 
 ExtensionApiTest::ResultCatcher::~ResultCatcher() {
 }
 
 bool ExtensionApiTest::ResultCatcher::GetNextResult() {
   // Depending on the tests, multiple results can come in from a single call
   // to RunMessageLoop(), so we maintain a queue of results and just pull them
   // off as the test calls this, going to the run loop only when the queue is
@@ skipping 18 matching lines @@
 
 void ExtensionApiTest::ResultCatcher::Observe(
     int type, const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (profile_restriction_ &&
       content::Source<Profile>(source).ptr() != profile_restriction_) {
     return;
   }
 
   switch (type) {
-    case chrome::NOTIFICATION_EXTENSION_TEST_PASSED:
+    case extensions::NOTIFICATION_EXTENSION_TEST_PASSED:
       VLOG(1) << "Got EXTENSION_TEST_PASSED notification.";
       results_.push_back(true);
       messages_.push_back(std::string());
       if (waiting_)
         base::MessageLoopForUI::current()->Quit();
       break;
 
-    case chrome::NOTIFICATION_EXTENSION_TEST_FAILED:
+    case extensions::NOTIFICATION_EXTENSION_TEST_FAILED:
       VLOG(1) << "Got EXTENSION_TEST_FAILED notification.";
       results_.push_back(false);
       messages_.push_back(*(content::Details<std::string>(details).ptr()));
       if (waiting_)
         base::MessageLoopForUI::current()->Quit();
       break;
 
     default:
       NOTREACHED();
   }
@@ skipping 269 matching lines @@
   test_config_->SetInteger(kSpawnedTestServerPort,
                            test_server()->host_port_pair().port());
 
   return true;
 }
 
 void ExtensionApiTest::SetUpCommandLine(CommandLine* command_line) {
   ExtensionBrowserTest::SetUpCommandLine(command_line);
   test_data_dir_ = test_data_dir_.AppendASCII("api_test");
 }