From b677bc4ec07a6320b24f107903850c4eddc87fde Mon Sep 17 00:00:00 2001
From: Mark Mentovai <mark@chromium.org>
Date: Tue, 7 Oct 2014 17:31:43 -0400
Subject: [PATCH] =?UTF-8?q?Simplify=20MinidumpModuleWriter=E2=80=99s=20mod?=
 =?UTF-8?q?ule=20name=20requirement=20implementation.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TEST=minidump_test MinidumpModuleWriter*
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/633163002
---
 minidump/minidump_module_writer.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/minidump/minidump_module_writer.cc b/minidump/minidump_module_writer.cc
index 66ad8d5a..04c8b177 100644
--- a/minidump/minidump_module_writer.cc
+++ b/minidump/minidump_module_writer.cc
@@ -250,13 +250,12 @@ void MinidumpModuleWriter::SetFileFlagsAndMask(uint32_t file_flags,
 
 bool MinidumpModuleWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
+  CHECK(name_);
 
   if (!MinidumpWritable::Freeze()) {
     return false;
   }
 
-  CHECK(name_);
-
   name_->RegisterRVA(&module_.ModuleNameRva);
 
   if (codeview_record_) {
@@ -281,11 +280,10 @@ size_t MinidumpModuleWriter::SizeOfObject() {
 
 std::vector<internal::MinidumpWritable*> MinidumpModuleWriter::Children() {
   DCHECK_GE(state(), kStateFrozen);
+  DCHECK(name_);
 
   std::vector<MinidumpWritable*> children;
-  if (name_) {
-    children.push_back(name_.get());
-  }
+  children.push_back(name_.get());
   if (codeview_record_) {
     children.push_back(codeview_record_);
   }