| Index: chrome/browser/extensions/api/cookies/cookies_api.cc
|
| diff --git a/chrome/browser/extensions/api/cookies/cookies_api.cc b/chrome/browser/extensions/api/cookies/cookies_api.cc
|
| index 7446484e6512d5c23d1ff5baa7d2ca7662f1f217..eaeb63e924752ca68f1042446461b1d8b3581f29 100644
|
| --- a/chrome/browser/extensions/api/cookies/cookies_api.cc
|
| +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
|
| @@ -49,8 +49,8 @@ namespace extensions {
|
| namespace cookies = api::cookies;
|
| namespace keys = cookies_api_constants;
|
|
|
| -CookiesEventRouter::CookiesEventRouter(Profile* profile)
|
| - : profile_(profile) {
|
| +CookiesEventRouter::CookiesEventRouter(content::BrowserContext* context)
|
| + : profile_(Profile::FromBrowserContext(context)) {
|
| CHECK(registrar_.IsEmpty());
|
| registrar_.Add(this,
|
| chrome::NOTIFICATION_COOKIE_CHANGED,
|
| @@ -130,17 +130,17 @@ void CookiesEventRouter::CookieChanged(
|
| cookie_domain);
|
| }
|
|
|
| -void CookiesEventRouter::DispatchEvent(
|
| - Profile* profile,
|
| - const std::string& event_name,
|
| - scoped_ptr<base::ListValue> event_args,
|
| - GURL& cookie_domain) {
|
| - EventRouter* router = profile ?
|
| - extensions::ExtensionSystem::Get(profile)->event_router() : NULL;
|
| +void CookiesEventRouter::DispatchEvent(content::BrowserContext* context,
|
| + const std::string& event_name,
|
| + scoped_ptr<base::ListValue> event_args,
|
| + GURL& cookie_domain) {
|
| + EventRouter* router =
|
| + context ? extensions::ExtensionSystem::Get(context)->event_router()
|
| + : NULL;
|
| if (!router)
|
| return;
|
| scoped_ptr<Event> event(new Event(event_name, event_args.Pass()));
|
| - event->restrict_to_browser_context = profile;
|
| + event->restrict_to_browser_context = context;
|
| event->event_url = cookie_domain;
|
| router->BroadcastEvent(event.Pass());
|
| }
|
|
|