diff options
| -rw-r--r-- | chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc index 21144f9..924aa7e 100644 --- a/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc +++ b/chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc @@ -16,7 +16,8 @@ TabContentsWrapperTestHarness::~TabContentsWrapperTestHarness() { } TestTabContents* TabContentsWrapperTestHarness::contents() { - return static_cast<TestTabContents*>(contents_wrapper_->tab_contents()); + return contents_wrapper_.get() ? + static_cast<TestTabContents*>(contents_wrapper_->tab_contents()) : NULL; } TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() { @@ -24,7 +25,7 @@ TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() { } void TabContentsWrapperTestHarness::SetContents(TestTabContents* contents) { - contents_wrapper_.reset(new TabContentsWrapper(contents)); + contents_wrapper_.reset(contents ? new TabContentsWrapper(contents) : NULL); } void TabContentsWrapperTestHarness::SetUp() { |