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

chrome/browser/extensions/extension_web_socket_proxy_private_api.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 "chrome/browser/extensions/extension_web_socket_proxy_private_api.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/internal_auth.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "net/base/escape.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
 #endif
 
 WebSocketProxyPrivate::WebSocketProxyPrivate()
     : is_finalized_(false), listening_port_(-1) {
 }
@@ skipping 53 matching lines @@
   int port = -1;
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(1, &port));
 
   if (chromeos::WebSocketProxyController::CheckCredentials(
           extension_id(), hostname, port,
           chromeos::WebSocketProxyController::PLAIN_TCP)) {
     if (!chromeos::WebSocketProxyController::IsInitiated()) {
       delay_response = true;
       registrar_.Add(
           this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
-          NotificationService::AllSources());
+          content::NotificationService::AllSources());
       chromeos::WebSocketProxyController::Initiate();
     }
 
     std::map<std::string, std::string> map;
     map["hostname"] = hostname;
     map["port"] = base::IntToString(port);
     map["extension_id"] = extension_id();
     StringValue* passport = Value::CreateStringValue(
         browser::InternalAuthGeneration::GeneratePassport(
             "web_socket_proxy", map));
@@ skipping 31 matching lines @@
     }
   }
   if (chromeos::WebSocketProxyController::CheckCredentials(
           extension_id(), hostname, port,
           do_tls ? chromeos::WebSocketProxyController::TLS_OVER_TCP :
               chromeos::WebSocketProxyController::PLAIN_TCP)) {
     if (!chromeos::WebSocketProxyController::IsInitiated()) {
       delay_response = true;
       registrar_.Add(
           this, chrome::NOTIFICATION_WEB_SOCKET_PROXY_STARTED,
-          NotificationService::AllSources());
+          content::NotificationService::AllSources());
       chromeos::WebSocketProxyController::Initiate();
     }
 
     std::map<std::string, std::string> map;
     map["hostname"] = hostname;
     map["port"] = base::IntToString(port);
     map["extension_id"] = extension_id();
     map["tls"] = do_tls ? "true" : "false";
     std::string passport = browser::InternalAuthGeneration::GeneratePassport(
         "web_socket_proxy", map);
     query_ = std::string("hostname=") +
         net::EscapeQueryParamValue(hostname, false) + "&port=" + map["port"] +
         "&tls=" + map["tls"] + "&passport=" +
         net::EscapeQueryParamValue(passport, false);
   }
 #endif  // defined(OS_CHROMEOS)
 
   if (delay_response) {
     const int kTimeout = 3;
     timer_.Start(FROM_HERE, base::TimeDelta::FromSeconds(kTimeout),
         this, &WebSocketProxyPrivate::Finalize);
   } else {
     Finalize();
   }
   return true;
 }