| Index: extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
|
| diff --git a/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc b/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
|
| index dcf41907cc1c92a7ef0cd1af74769aab2fbcd4dd..1a0cc8060055f8b9ccc783d6900425358cfbb793 100644
|
| --- a/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
|
| +++ b/extensions/browser/guest_view/web_view/web_view_media_access_apitest.cc
|
| @@ -95,7 +95,7 @@ class WebViewMediaAccessAPITest : public WebViewAPITest {
|
|
|
| IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllow) {
|
| LaunchApp("web_view/media_access/allow");
|
| - scoped_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| + std::unique_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| embedder_web_contents_->SetDelegate(mock.get());
|
|
|
| RunTest("testAllow");
|
| @@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllow) {
|
|
|
| IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowAndThenDeny) {
|
| LaunchApp("web_view/media_access/allow");
|
| - scoped_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| + std::unique_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| embedder_web_contents_->SetDelegate(mock.get());
|
|
|
| RunTest("testAllowAndThenDeny");
|
| @@ -115,7 +115,7 @@ IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowAndThenDeny) {
|
|
|
| IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowAsync) {
|
| LaunchApp("web_view/media_access/allow");
|
| - scoped_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| + std::unique_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| embedder_web_contents_->SetDelegate(mock.get());
|
|
|
| RunTest("testAllowAsync");
|
| @@ -125,7 +125,7 @@ IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowAsync) {
|
|
|
| IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowTwice) {
|
| LaunchApp("web_view/media_access/allow");
|
| - scoped_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| + std::unique_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| embedder_web_contents_->SetDelegate(mock.get());
|
|
|
| RunTest("testAllowTwice");
|
| @@ -135,7 +135,7 @@ IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestAllowTwice) {
|
|
|
| IN_PROC_BROWSER_TEST_F(WebViewMediaAccessAPITest, TestCheck) {
|
| LaunchApp("web_view/media_access/check");
|
| - scoped_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| + std::unique_ptr<MockWebContentsDelegate> mock(new MockWebContentsDelegate());
|
| embedder_web_contents_->SetDelegate(mock.get());
|
|
|
| RunTest("testCheck");
|
|
|