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

Side by Side Diff: chrome/browser/ui/app_list/arc/arc_app_test.h

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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ 5 #ifndef CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_
6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ 6 #define CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 13
14 namespace arc { 14 namespace arc {
15 class AppInfo; 15 class AppInfo;
16 class FakeArcBridgeService; 16 class FakeArcBridgeService;
17 class FakeAppInstance; 17 class FakeAppInstance;
18 } 18 }
19 19
20 namespace content { 20 namespace content {
21 class BrowserContext; 21 class BrowserContext;
22 } 22 }
(...skipping 12 matching lines...) Expand all
35 const std::vector<arc::AppInfo>& fake_apps() const { return fake_apps_; } 35 const std::vector<arc::AppInfo>& fake_apps() const { return fake_apps_; }
36 36
37 arc::FakeArcBridgeService* bridge_service() { return bridge_service_.get(); } 37 arc::FakeArcBridgeService* bridge_service() { return bridge_service_.get(); }
38 38
39 arc::FakeAppInstance* app_instance() { return app_instance_.get(); } 39 arc::FakeAppInstance* app_instance() { return app_instance_.get(); }
40 40
41 private: 41 private:
42 // Unowned pointer. 42 // Unowned pointer.
43 content::BrowserContext* browser_context_ = nullptr; 43 content::BrowserContext* browser_context_ = nullptr;
44 44
45 scoped_ptr<arc::FakeArcBridgeService> bridge_service_; 45 std::unique_ptr<arc::FakeArcBridgeService> bridge_service_;
46 scoped_ptr<arc::FakeAppInstance> app_instance_; 46 std::unique_ptr<arc::FakeAppInstance> app_instance_;
47 std::vector<arc::AppInfo> fake_apps_; 47 std::vector<arc::AppInfo> fake_apps_;
48 48
49 DISALLOW_COPY_AND_ASSIGN(ArcAppTest); 49 DISALLOW_COPY_AND_ASSIGN(ArcAppTest);
50 }; 50 };
51 51
52 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_ 52 #endif // CHROME_BROWSER_UI_APP_LIST_ARC_ARC_APP_TEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/app_list/arc/arc_app_model_builder.cc ('k') | chrome/browser/ui/app_list/arc/arc_app_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698