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

Side by Side Diff: chromecast/browser/test/chromecast_browser_test.h

Issue 1875623002: Convert //chromecast from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_ 5 #ifndef CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_
6 #define CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_ 6 #define CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_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 "content/public/test/browser_test.h" 11 #include "content/public/test/browser_test.h"
11 #include "content/public/test/browser_test_base.h" 12 #include "content/public/test/browser_test_base.h"
12 13
13 namespace content { 14 namespace content {
14 class WebContents; 15 class WebContents;
15 } 16 }
16 17
17 namespace chromecast { 18 namespace chromecast {
18 namespace shell { 19 namespace shell {
19 class CastContentWindow; 20 class CastContentWindow;
(...skipping 17 matching lines...) Expand all
37 protected: 38 protected:
38 void NavigateToURL(content::WebContents* window, const GURL& gurl); 39 void NavigateToURL(content::WebContents* window, const GURL& gurl);
39 40
40 // Creates a new window and loads about:blank. 41 // Creates a new window and loads about:blank.
41 content::WebContents* CreateBrowser(); 42 content::WebContents* CreateBrowser();
42 43
43 // Returns the window for the test. 44 // Returns the window for the test.
44 content::WebContents* web_contents() const { return web_contents_.get(); } 45 content::WebContents* web_contents() const { return web_contents_.get(); }
45 46
46 private: 47 private:
47 scoped_ptr<content::WebContents> web_contents_; 48 std::unique_ptr<content::WebContents> web_contents_;
48 scoped_ptr<CastContentWindow> window_; 49 std::unique_ptr<CastContentWindow> window_;
49 50
50 bool setup_called_; 51 bool setup_called_;
51 52
52 DISALLOW_COPY_AND_ASSIGN(ChromecastBrowserTest); 53 DISALLOW_COPY_AND_ASSIGN(ChromecastBrowserTest);
53 }; 54 };
54 55
55 } // namespace shell 56 } // namespace shell
56 } // namespace chromecast 57 } // namespace chromecast
57 58
58 #endif // CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_ 59 #endif // CHROMECAST_BROWSER_TEST_CHROMECAST_BROWSER_TEST_H_
OLDNEW
« no previous file with comments | « chromecast/browser/service/cast_service_simple.h ('k') | chromecast/browser/url_request_context_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698