OpaqueBrowserFrameViewPlatformSpecific::Create no longer returns NULL.

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

Index: chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 19ad04299e523b4456ea48419dfa68b213a8b27f..f159bfe6e253ce73be2b5366f2d29a65a46d194f 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -428,10 +428,9 @@ void OpaqueBrowserFrameView::Observe(
 
 bool OpaqueBrowserFrameView::ShouldShowWindowIcon() const {
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  // ShouldShowTitleBar defaults to true.
-  if (platform_observer_ && !platform_observer_->ShouldShowTitleBar())
-    return false;
-  return delegate && delegate->ShouldShowWindowIcon();
+  DCHECK(platform_observer_);

[James Cook, 2014/01/06 17:54:12]

nit: I don't think you need to DCHECK these pointers, since the fact that you
immediately dereference them tells the reader you don't expect them to ever be
NULL.

[Matt Giuca, 2014/01/06 23:51:40]

Done.

+  return platform_observer_->ShouldShowTitleBar() && delegate &&
+         delegate->ShouldShowWindowIcon();
 }
 
 bool OpaqueBrowserFrameView::ShouldShowWindowTitle() const {
@@ -439,10 +438,9 @@ bool OpaqueBrowserFrameView::ShouldShowWindowTitle() const {
   // a window is being destroyed.
   // See more discussion at http://crosbug.com/8958
   views::WidgetDelegate* delegate = frame()->widget_delegate();
-  // ShouldShowTitleBar defaults to true.
-  if (platform_observer_ && !platform_observer_->ShouldShowTitleBar())
-    return false;
-  return delegate && delegate->ShouldShowWindowTitle();
+  DCHECK(platform_observer_);
+  return platform_observer_->ShouldShowTitleBar() && delegate &&
+         delegate->ShouldShowWindowTitle();
 }
 
 base::string16 OpaqueBrowserFrameView::GetWindowTitle() const {
@@ -470,8 +468,7 @@ gfx::Size OpaqueBrowserFrameView::GetBrowserViewMinimumSize() const {
 bool OpaqueBrowserFrameView::ShouldShowCaptionButtons() const {
   if (!OpaqueBrowserFrameViewLayout::ShouldAddDefaultCaptionButtons())
     return false;
-  if (!platform_observer_)
-    return true;
+  DCHECK(platform_observer_);
   return platform_observer_->ShouldShowCaptionButtons();
 }