Do not register invalid layout

ash/display/display_layout_store.cc

Index: ash/display/display_layout_store.cc
diff --git a/ash/display/display_layout_store.cc b/ash/display/display_layout_store.cc
index b78bf98b36043814a921ba7e9c270b58f5fd461d..316a51175fb8bbd81c43144982ce807fe054cb01 100644
--- a/ash/display/display_layout_store.cc
+++ b/ash/display/display_layout_store.cc
@@ -68,7 +68,8 @@ void DisplayLayoutStore::RegisterLayoutForDisplayIdList(
       layout->placement_list[0]->parent_display_id = list[0];
     }
   }
-  DCHECK(DisplayLayout::Validate(list, *layout.get())) << layout->ToString();
+  if (!DisplayLayout::Validate(list, *layout.get()))
+    return;
   layouts_[list] = std::move(layout);
 }
 
@@ -79,8 +80,8 @@ const DisplayLayout& DisplayLayoutStore::GetRegisteredDisplayLayout(
   const DisplayLayout* layout = iter != layouts_.end()
                                     ? iter->second.get()
                                     : CreateDefaultDisplayLayout(list);
-  DCHECK(DisplayLayout::Validate(list, *layout)) << layout->ToString();
-  DCHECK_NE(layout->primary_id, gfx::Display::kInvalidDisplayID);
+  CHECK(DisplayLayout::Validate(list, *layout)) << layout->ToString();
+  CHECK_NE(layout->primary_id, gfx::Display::kInvalidDisplayID);

[oshima, 2016/03/31 01:15:44]

I'm adding CHECK to have better crash reports when this ever happens.

   return *layout;
 }