| Index: chrome/browser/ui/views/frame/test_with_browser_view.h
|
| diff --git a/chrome/browser/ui/views/frame/test_with_browser_view.h b/chrome/browser/ui/views/frame/test_with_browser_view.h
|
| index 211d97036aeb8f88579ecefd9849f1a096028f4d..d091378ef539676ef9a674f5a1c058a2269e0fe5 100644
|
| --- a/chrome/browser/ui/views/frame/test_with_browser_view.h
|
| +++ b/chrome/browser/ui/views/frame/test_with_browser_view.h
|
| @@ -5,8 +5,9 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
|
| #define CHROME_BROWSER_UI_VIEWS_FRAME_TEST_WITH_BROWSER_VIEW_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/test/base/browser_with_test_window_test.h"
|
|
|
| namespace chrome {
|
| @@ -39,9 +40,9 @@ class TestWithBrowserView : public BrowserWithTestWindowTest {
|
|
|
| private:
|
| BrowserView* browser_view_; // Not owned.
|
| - scoped_ptr<ScopedTestingLocalState> local_state_;
|
| - scoped_ptr<predictors::PredictorDatabase> predictor_db_;
|
| - scoped_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
|
| + std::unique_ptr<ScopedTestingLocalState> local_state_;
|
| + std::unique_ptr<predictors::PredictorDatabase> predictor_db_;
|
| + std::unique_ptr<chrome::TestingIOThreadState> testing_io_thread_state_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(TestWithBrowserView);
|
| };
|
|
|