crash: Fixes following r413431

components/crash/content/browser/crash_dump_manager_android.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/files/file_util.h"
@@ skipping 21 matching lines @@
                                    int descriptor_id)
     : crash_dump_dir_(crash_dump_dir), descriptor_id_(descriptor_id) {}
 
 CrashDumpManager::~CrashDumpManager() {
 }
 
 void CrashDumpManager::OnChildStart(int child_process_id,
                                     content::FileDescriptorInfo* mappings) {
   DCHECK_CURRENTLY_ON(BrowserThread::PROCESS_LAUNCHER);
 
-  //if (!breakpad::IsCrashReporterEnabled())

[Lei Zhang, 2016/09/01 23:17:58]

Whoa, what happened here? Do we need to merge this back to M54 so that we
respect the user preferences re: crash reporting?

[boliu, 2016/09/01 23:26:18]

yes, definitely needs to be merged

-  //  return;
+  if (!breakpad::IsCrashReporterEnabled())
+    return;
 
   base::FilePath minidump_path;
   if (!base::CreateTemporaryFile(&minidump_path)) {
     LOG(ERROR) << "Failed to create temporary file, crash won't be reported.";
     return;
   }
 
   // We need read permission as the minidump is generated in several phases
   // and needs to be read at some point.
   int flags = base::File::FLAG_OPEN | base::File::FLAG_READ |
@@ skipping 109 matching lines @@
       return;
     }
     minidump_path = iter->second;
     child_process_id_to_minidump_path_.erase(iter);
   }
   ProcessMinidump(minidump_path, pid, process_type, termination_status,
                   app_state);
 }
 
 }  // namespace breakpad