| 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 d969aa5e5c68c5eaf09d9090852ceea759569c59..16aabadf614b666cc6adf6e721de580570ba7195 100644
|
| --- a/chrome/browser/extensions/api/cookies/cookies_api.cc
|
| +++ b/chrome/browser/extensions/api/cookies/cookies_api.cc
|
| @@ -18,6 +18,7 @@
|
| #include "chrome/browser/chrome_notification_types.h"
|
| #include "chrome/browser/extensions/api/cookies/cookies_api_constants.h"
|
| #include "chrome/browser/extensions/api/cookies/cookies_helpers.h"
|
| +#include "chrome/browser/extensions/chrome_extension_function_details.h"
|
| #include "chrome/browser/profiles/profile.h"
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| @@ -525,14 +526,14 @@ void CookiesRemoveFunction::RespondOnUIThread() {
|
| SendResponse(true);
|
| }
|
|
|
| -bool CookiesGetAllCookieStoresFunction::RunSync() {
|
| - Profile* original_profile = GetProfile();
|
| +ExtensionFunction::ResponseAction CookiesGetAllCookieStoresFunction::Run() {
|
| + Profile* original_profile = Profile::FromBrowserContext(browser_context());
|
| DCHECK(original_profile);
|
| std::unique_ptr<base::ListValue> original_tab_ids(new base::ListValue());
|
| Profile* incognito_profile = NULL;
|
| std::unique_ptr<base::ListValue> incognito_tab_ids;
|
| - if (include_incognito() && GetProfile()->HasOffTheRecordProfile()) {
|
| - incognito_profile = GetProfile()->GetOffTheRecordProfile();
|
| + if (include_incognito() && original_profile->HasOffTheRecordProfile()) {
|
| + incognito_profile = original_profile->GetOffTheRecordProfile();
|
| if (incognito_profile)
|
| incognito_tab_ids.reset(new base::ListValue());
|
| }
|
| @@ -560,8 +561,8 @@ bool CookiesGetAllCookieStoresFunction::RunSync() {
|
| cookie_stores.push_back(cookies_helpers::CreateCookieStore(
|
| incognito_profile, incognito_tab_ids.release()));
|
| }
|
| - results_ = GetAllCookieStores::Results::Create(cookie_stores);
|
| - return true;
|
| + return RespondNow(
|
| + ArgumentList(GetAllCookieStores::Results::Create(cookie_stores)));
|
| }
|
|
|
| CookiesAPI::CookiesAPI(content::BrowserContext* context)
|
|
|