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

chrome/browser/extensions/extension_browser_actions_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_browser_actions_api.h"
 
 #include <string>
 
 #include "base/values.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/render_messages.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 
 namespace {
 // Errors.
 const char kNoBrowserActionError[] =
     "This extension has no browser action specified.";
 const char kIconIndexOutOfBounds[] =
     "Browser action icon index out of bounds.";
 }
 
 bool BrowserActionFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &details_));
   EXTENSION_FUNCTION_VALIDATE(details_ != NULL);
 
   if (details_->HasKey("tabId"))
     EXTENSION_FUNCTION_VALIDATE(details_->GetInteger("tabId", &tab_id_));
 
   const Extension* extension = GetExtension();
   browser_action_ = extension->browser_action();
   if (!browser_action_) {
     error_ = kNoBrowserActionError;
     return false;
   }
 
   if (!RunBrowserAction())
     return false;
 
-  NotificationService::current()->Notify(
+  content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_EXTENSION_BROWSER_ACTION_UPDATED,
       content::Source<ExtensionAction>(browser_action_),
-      NotificationService::NoDetails());
+      content::NotificationService::NoDetails());
   return true;
 }
 
 bool BrowserActionSetIconFunction::RunBrowserAction() {
   base::BinaryValue* binary = NULL;
   EXTENSION_FUNCTION_VALIDATE(details_->GetBinary("imageData", &binary));
   IPC::Message bitmap_pickle(binary->GetBuffer(), binary->GetSize());
   void* iter = NULL;
   SkBitmap bitmap;
   EXTENSION_FUNCTION_VALIDATE(
@@ skipping 37 matching lines @@
   for (size_t i = 0; i < arraysize(color_array); ++i) {
     EXTENSION_FUNCTION_VALIDATE(list->GetInteger(i, &color_array[i]));
   }
 
   SkColor color = SkColorSetARGB(color_array[3], color_array[0], color_array[1],
                                  color_array[2]);
   browser_action_->SetBadgeBackgroundColor(tab_id_, color);
 
   return true;
 }