| OLD | NEW |
| 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 "base/compiler_specific.h" | 5 #include "base/compiler_specific.h" |
| 6 #include "base/memory/scoped_ptr.h" | 6 #include "base/memory/scoped_ptr.h" |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "content/browser/web_contents/web_contents_impl.h" | 8 #include "content/browser/web_contents/web_contents_impl.h" |
| 9 #include "content/browser/renderer_host/test_render_view_host.h" | 9 #include "content/browser/renderer_host/test_render_view_host.h" |
| 10 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 io_thread_(content::BrowserThread::IO, &message_loop_) { | 29 io_thread_(content::BrowserThread::IO, &message_loop_) { |
| 30 } | 30 } |
| 31 | 31 |
| 32 private: | 32 private: |
| 33 content::TestBrowserThread file_user_blocking_thread_; | 33 content::TestBrowserThread file_user_blocking_thread_; |
| 34 content::TestBrowserThread io_thread_; | 34 content::TestBrowserThread io_thread_; |
| 35 }; | 35 }; |
| 36 | 36 |
| 37 TEST_F(WebContentsDelegateTest, UnregisterInDestructor) { | 37 TEST_F(WebContentsDelegateTest, UnregisterInDestructor) { |
| 38 scoped_ptr<WebContentsImpl> contents_a( | 38 scoped_ptr<WebContentsImpl> contents_a( |
| 39 new WebContentsImpl(browser_context_.get(), NULL, MSG_ROUTING_NONE, NULL, | 39 WebContentsImpl::Create(browser_context_.get(), NULL, MSG_ROUTING_NONE, |
| 40 NULL, NULL)); | 40 NULL)); |
| 41 scoped_ptr<WebContentsImpl> contents_b( | 41 scoped_ptr<WebContentsImpl> contents_b( |
| 42 new WebContentsImpl(browser_context_.get(), NULL, MSG_ROUTING_NONE, NULL, | 42 WebContentsImpl::Create(browser_context_.get(), NULL, MSG_ROUTING_NONE, |
| 43 NULL, NULL)); | 43 NULL)); |
| 44 EXPECT_EQ(NULL, contents_a->GetDelegate()); | 44 EXPECT_EQ(NULL, contents_a->GetDelegate()); |
| 45 EXPECT_EQ(NULL, contents_b->GetDelegate()); | 45 EXPECT_EQ(NULL, contents_b->GetDelegate()); |
| 46 | 46 |
| 47 scoped_ptr<MockWebContentsDelegate> delegate(new MockWebContentsDelegate()); | 47 scoped_ptr<MockWebContentsDelegate> delegate(new MockWebContentsDelegate()); |
| 48 | 48 |
| 49 // Setting a delegate should work correctly. | 49 // Setting a delegate should work correctly. |
| 50 contents_a->SetDelegate(delegate.get()); | 50 contents_a->SetDelegate(delegate.get()); |
| 51 EXPECT_EQ(delegate.get(), contents_a->GetDelegate()); | 51 EXPECT_EQ(delegate.get(), contents_a->GetDelegate()); |
| 52 EXPECT_TRUE(contents_b->GetDelegate() == NULL); | 52 EXPECT_TRUE(contents_b->GetDelegate() == NULL); |
| 53 | 53 |
| (...skipping 20 matching lines...) Expand all Loading... |
| 74 delegate.reset(NULL); | 74 delegate.reset(NULL); |
| 75 EXPECT_TRUE(contents_a->GetDelegate() == NULL); | 75 EXPECT_TRUE(contents_a->GetDelegate() == NULL); |
| 76 EXPECT_TRUE(contents_b->GetDelegate() == NULL); | 76 EXPECT_TRUE(contents_b->GetDelegate() == NULL); |
| 77 | 77 |
| 78 // Destroy the WebContentses and run the message loop to prevent leaks. | 78 // Destroy the WebContentses and run the message loop to prevent leaks. |
| 79 contents_a.reset(); | 79 contents_a.reset(); |
| 80 contents_b.reset(); | 80 contents_b.reset(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace | 83 } // namespace |
| OLD | NEW |