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

Unified Diff: chrome/browser/ui/app_list/profile_loader_unittest.cc

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
« no previous file with comments | « chrome/browser/ui/app_list/profile_loader.h ('k') | chrome/browser/ui/app_list/search/app_result.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/app_list/profile_loader_unittest.cc
diff --git a/chrome/browser/ui/app_list/profile_loader_unittest.cc b/chrome/browser/ui/app_list/profile_loader_unittest.cc
index b709ca84bb070c7c056a0e33b062b2b5b5172a4a..39cd45d412b78ee75a24e84fbfb1da25b9f26318 100644
--- a/chrome/browser/ui/app_list/profile_loader_unittest.cc
+++ b/chrome/browser/ui/app_list/profile_loader_unittest.cc
@@ -2,11 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "chrome/browser/ui/app_list/profile_loader.h"
+
+#include <memory>
+
#include "base/bind.h"
#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_list/profile_loader.h"
#include "chrome/browser/ui/app_list/test/fake_profile.h"
#include "chrome/browser/ui/app_list/test/fake_profile_store.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -45,10 +47,10 @@ class ProfileLoaderUnittest : public testing::Test {
}
protected:
- scoped_ptr<ProfileLoader> loader_;
- scoped_ptr<FakeProfileStore> profile_store_;
- scoped_ptr<FakeProfile> profile1_;
- scoped_ptr<FakeProfile> profile2_;
+ std::unique_ptr<ProfileLoader> loader_;
+ std::unique_ptr<FakeProfileStore> profile_store_;
+ std::unique_ptr<FakeProfile> profile1_;
+ std::unique_ptr<FakeProfile> profile2_;
Profile* last_callback_result_;
};
« no previous file with comments | « chrome/browser/ui/app_list/profile_loader.h ('k') | chrome/browser/ui/app_list/search/app_result.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698