Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(927)

Unified Diff: chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc

Issue 2038613003: Revert of ExtensionFunction: don't pass ownership of base::Value by raw pointer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
diff --git a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
index 167a6aee70bb46e815c83eca06d816c807aef3a3..b7fefdcca05fa1b434cb40733603af5488858fc1 100644
--- a/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
+++ b/chrome/browser/extensions/api/language_settings_private/language_settings_private_api.cc
@@ -14,7 +14,6 @@
#include "base/i18n/rtl.h"
#include "base/memory/linked_ptr.h"
-#include "base/memory/ptr_util.h"
#include "base/strings/string16.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
@@ -242,7 +241,7 @@
language_list->Append(language.ToValue());
}
- return RespondNow(OneArgument(std::move(language_list)));
+ return RespondNow(OneArgument(language_list.release()));
}
LanguageSettingsPrivateSetLanguageListFunction::
@@ -303,7 +302,7 @@
SpellcheckCustomDictionary* dictionary = service->GetCustomDictionary();
if (dictionary->IsLoaded())
- return RespondNow(OneArgument(GetSpellcheckWords()));
+ return RespondNow(OneArgument(GetSpellcheckWords().release()));
dictionary->AddObserver(this);
AddRef(); // Balanced in OnCustomDictionaryLoaded().
@@ -315,7 +314,7 @@
SpellcheckService* service =
SpellcheckServiceFactory::GetForContext(browser_context());
service->GetCustomDictionary()->RemoveObserver(this);
- Respond(OneArgument(GetSpellcheckWords()));
+ Respond(OneArgument(GetSpellcheckWords().release()));
Release();
}
@@ -360,8 +359,7 @@
SpellcheckServiceFactory::GetForContext(browser_context());
bool success = service->GetCustomDictionary()->AddWord(params->word);
- return RespondNow(
- OneArgument(base::MakeUnique<base::FundamentalValue>(success)));
+ return RespondNow(OneArgument(new base::FundamentalValue(success)));
}
LanguageSettingsPrivateRemoveSpellcheckWordFunction::
@@ -383,8 +381,7 @@
SpellcheckServiceFactory::GetForContext(browser_context());
bool success = service->GetCustomDictionary()->RemoveWord(params->word);
- return RespondNow(
- OneArgument(base::MakeUnique<base::FundamentalValue>(success)));
+ return RespondNow(OneArgument(new base::FundamentalValue(success)));
}
LanguageSettingsPrivateGetTranslateTargetLanguageFunction::
@@ -398,8 +395,8 @@
ExtensionFunction::ResponseAction
LanguageSettingsPrivateGetTranslateTargetLanguageFunction::Run() {
- return RespondNow(OneArgument(
- base::MakeUnique<base::StringValue>(TranslateService::GetTargetLanguage(
+ return RespondNow(OneArgument(new base::StringValue(
+ TranslateService::GetTargetLanguage(
chrome_details_.GetProfile()->GetPrefs()))));
}

Powered by Google App Engine
This is Rietveld 408576698