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

Side by Side Diff: content/browser/web_contents/web_contents_delegate_unittest.cc

Issue 1874893002: Convert //content/browser 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/public/browser/web_contents_delegate.h"
6
7 #include <memory>
8
5 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
8 #include "content/browser/web_contents/web_contents_impl.h" 11 #include "content/browser/web_contents/web_contents_impl.h"
9 #include "content/public/browser/web_contents_delegate.h"
10 #include "content/public/test/test_browser_context.h" 12 #include "content/public/test/test_browser_context.h"
11 #include "content/test/test_render_view_host.h" 13 #include "content/test/test_render_view_host.h"
12 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
13 15
14 namespace content { 16 namespace content {
15 17
16 class MockWebContentsDelegate : public WebContentsDelegate { 18 class MockWebContentsDelegate : public WebContentsDelegate {
17 }; 19 };
18 20
19 class WebContentsDelegateTest : public RenderViewHostImplTestHarness { 21 class WebContentsDelegateTest : public RenderViewHostImplTestHarness {
20 }; 22 };
21 23
22 TEST_F(WebContentsDelegateTest, UnregisterInDestructor) { 24 TEST_F(WebContentsDelegateTest, UnregisterInDestructor) {
23 scoped_ptr<WebContentsImpl> contents_a(static_cast<WebContentsImpl*>( 25 std::unique_ptr<WebContentsImpl> contents_a(static_cast<WebContentsImpl*>(
24 WebContents::Create(WebContents::CreateParams(browser_context())))); 26 WebContents::Create(WebContents::CreateParams(browser_context()))));
25 scoped_ptr<WebContentsImpl> contents_b(static_cast<WebContentsImpl*>( 27 std::unique_ptr<WebContentsImpl> contents_b(static_cast<WebContentsImpl*>(
26 WebContents::Create(WebContents::CreateParams(browser_context())))); 28 WebContents::Create(WebContents::CreateParams(browser_context()))));
27 EXPECT_EQ(NULL, contents_a->GetDelegate()); 29 EXPECT_EQ(NULL, contents_a->GetDelegate());
28 EXPECT_EQ(NULL, contents_b->GetDelegate()); 30 EXPECT_EQ(NULL, contents_b->GetDelegate());
29 31
30 scoped_ptr<MockWebContentsDelegate> delegate(new MockWebContentsDelegate()); 32 std::unique_ptr<MockWebContentsDelegate> delegate(
33 new MockWebContentsDelegate());
31 34
32 // Setting a delegate should work correctly. 35 // Setting a delegate should work correctly.
33 contents_a->SetDelegate(delegate.get()); 36 contents_a->SetDelegate(delegate.get());
34 EXPECT_EQ(delegate.get(), contents_a->GetDelegate()); 37 EXPECT_EQ(delegate.get(), contents_a->GetDelegate());
35 EXPECT_TRUE(contents_b->GetDelegate() == NULL); 38 EXPECT_TRUE(contents_b->GetDelegate() == NULL);
36 39
37 // A delegate can be a delegate to multiple WebContentsImpl. 40 // A delegate can be a delegate to multiple WebContentsImpl.
38 contents_b->SetDelegate(delegate.get()); 41 contents_b->SetDelegate(delegate.get());
39 EXPECT_EQ(delegate.get(), contents_a->GetDelegate()); 42 EXPECT_EQ(delegate.get(), contents_a->GetDelegate());
40 EXPECT_EQ(delegate.get(), contents_b->GetDelegate()); 43 EXPECT_EQ(delegate.get(), contents_b->GetDelegate());
(...skipping 16 matching lines...) Expand all
57 delegate.reset(NULL); 60 delegate.reset(NULL);
58 EXPECT_TRUE(contents_a->GetDelegate() == NULL); 61 EXPECT_TRUE(contents_a->GetDelegate() == NULL);
59 EXPECT_TRUE(contents_b->GetDelegate() == NULL); 62 EXPECT_TRUE(contents_b->GetDelegate() == NULL);
60 63
61 // Destroy the WebContentses and run the message loop to prevent leaks. 64 // Destroy the WebContentses and run the message loop to prevent leaks.
62 contents_a.reset(); 65 contents_a.reset();
63 contents_b.reset(); 66 contents_b.reset();
64 } 67 }
65 68
66 } // namespace content 69 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/web_contents/web_contents_android.cc ('k') | content/browser/web_contents/web_contents_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698