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

Unified Diff: chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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/ui/cocoa/infobars/translate_infobar_unittest.mm
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
index 475c511b4e19e148968ebf61f7880dd7453753c4..a5e41b05d20421c9798928dc8b8c00d579563efa 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
@@ -103,9 +103,9 @@ class TranslationInfoBarTest : public CocoaProfileTest {
ChromeTranslateClient* chrome_translate_client =
ChromeTranslateClient::FromWebContents(web_contents_.get());
- scoped_ptr<translate::TranslateInfoBarDelegate> delegate(
+ std::unique_ptr<translate::TranslateInfoBarDelegate> delegate(
new MockTranslateInfoBarDelegate(web_contents_.get(), type, error));
- scoped_ptr<infobars::InfoBar> infobar(
+ std::unique_ptr<infobars::InfoBar> infobar(
chrome_translate_client->CreateInfoBar(std::move(delegate)));
if (infobar_)
infobar_->CloseSoon();
@@ -126,7 +126,7 @@ class TranslationInfoBarTest : public CocoaProfileTest {
return static_cast<MockTranslateInfoBarDelegate*>(infobar_->delegate());
}
- scoped_ptr<WebContents> web_contents_;
+ std::unique_ptr<WebContents> web_contents_;
InfoBarCocoa* infobar_; // weak, deletes itself
base::scoped_nsobject<TranslateInfoBarControllerBase> infobar_controller_;
};
@@ -249,7 +249,7 @@ TEST_F(TranslationInfoBarTest, Bug36895) {
// Verify that the infobar shows the "Always translate this language" button
// after doing 3 translations.
TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
- scoped_ptr<translate::TranslatePrefs> translate_prefs(
+ std::unique_ptr<translate::TranslatePrefs> translate_prefs(
ChromeTranslateClient::CreateTranslatePrefs(profile()->GetPrefs()));
translate_prefs->ResetTranslationAcceptedCount("en");
for (int i = 0; i < 4; ++i) {
@@ -265,7 +265,7 @@ TEST_F(TranslationInfoBarTest, TriggerShowAlwaysTranslateButton) {
// Verify that the infobar shows the "Never translate this language" button
// after denying 3 translations.
TEST_F(TranslationInfoBarTest, TriggerShowNeverTranslateButton) {
- scoped_ptr<translate::TranslatePrefs> translate_prefs(
+ std::unique_ptr<translate::TranslatePrefs> translate_prefs(
ChromeTranslateClient::CreateTranslatePrefs(profile()->GetPrefs()));
translate_prefs->ResetTranslationDeniedCount("en");
for (int i = 0; i < 4; ++i) {

Powered by Google App Engine
This is Rietveld 408576698