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

Side by Side Diff: chrome/browser/ui/views/frame/test_with_browser_view.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/test/base/browser_with_test_window_test.h" 11 #include "chrome/test/base/browser_with_test_window_test.h"
11 12
12 namespace chrome { 13 namespace chrome {
13 class TestingIOThreadState; 14 class TestingIOThreadState;
14 } 15 }
15 16
16 namespace predictors { 17 namespace predictors {
17 class PredictorDatabase; 18 class PredictorDatabase;
18 } 19 }
19 20
(...skipping 12 matching lines...) Expand all
32 // BrowserWithTestWindowTest overrides: 33 // BrowserWithTestWindowTest overrides:
33 void SetUp() override; 34 void SetUp() override;
34 void TearDown() override; 35 void TearDown() override;
35 TestingProfile* CreateProfile() override; 36 TestingProfile* CreateProfile() override;
36 BrowserWindow* CreateBrowserWindow() override; 37 BrowserWindow* CreateBrowserWindow() override;
37 38
38 BrowserView* browser_view() { return browser_view_; } 39 BrowserView* browser_view() { return browser_view_; }
39 40
40 private: 41 private:
41 BrowserView* browser_view_; // Not owned. 42 BrowserView* browser_view_; // Not owned.
42 scoped_ptr<ScopedTestingLocalState> local_state_; 43 std::unique_ptr<ScopedTestingLocalState> local_state_;
43 scoped_ptr<predictors::PredictorDatabase> predictor_db_; 44 std::unique_ptr<predictors::PredictorDatabase> predictor_db_;
44 scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_; 45 std::unique_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
45 46
46 DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView); 47 DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView);
47 }; 48 };
48 49
49 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_ 50 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/taskbar_decorator_win.cc ('k') | chrome/browser/ui/views/frame/test_with_browser_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698