More instrumentation to diagnose an Android renderer crash.

chrome/renderer/chrome_render_thread_observer.cc

 // Copyright (c) 2012 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 "chrome/renderer/chrome_render_thread_observer.h"
 
 #include <stddef.h>
 
 #include <limits>
 #include <memory>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/media/media_resource_provider.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/resource_usage_reporter.mojom.h"
@@ skipping 289 matching lines @@
 }
 
 void ChromeRenderThreadObserver::OnSetContentSettingRules(
     const RendererContentSettingRules& rules) {
   content_setting_rules_ = rules;
 }
 
 void ChromeRenderThreadObserver::OnSetFieldTrialGroup(
     const std::string& field_trial_name,
     const std::string& group_name,
-    base::ProcessId sender_pid) {
+    base::ProcessId sender_pid,
+    int32_t debug_token) {
   // Check that the sender's PID doesn't change between messages. We expect
   // these IPCs to always be delivered from the same browser process, whose pid
   // should not change.
   // TODO(asvitkine): Remove this after http://crbug.com/359406 is fixed.
   static base::ProcessId sender_pid_cached = sender_pid;
   CHECK_EQ(sender_pid_cached, sender_pid) << sender_pid_cached << "/"
                                           << sender_pid;
+  // Check that the sender's debug_token doesn't change between messages.
+  // TODO(asvitkine): Remove this after http://crbug.com/359406 is fixed.
+  static int32_t debug_token_cached = debug_token;
+  CHECK_EQ(debug_token_cached, debug_token) << debug_token_cached << "/"
+                                            << debug_token;
+  // The debug token should also correspond to what was specified on the
+  // --force-fieldtrials command line for DebugToken trial.
+  const std::string debug_token_trial_value =
+      base::FieldTrialList::FindFullName("DebugToken");
+  if (!debug_token_trial_value.empty()) {
+    CHECK_EQ(base::IntToString(debug_token), debug_token_trial_value)
+        << debug_token << "/" << debug_token_trial_value;
+  }
+
   base::FieldTrial* trial =
       base::FieldTrialList::CreateFieldTrial(field_trial_name, group_name);
   // TODO(asvitkine): Remove this after http://crbug.com/359406 is fixed.
   if (!trial) {
     // Log the --force-fieldtrials= switch value for debugging purposes. Take
     // its substring starting with the trial name, since otherwise the end of
     // it can get truncated in the dump.
     std::string switch_substr = base::CommandLine::ForCurrentProcess()->
         GetSwitchValueASCII(switches::kForceFieldTrials);
     size_t index = switch_substr.find(field_trial_name);
@@ skipping 16 matching lines @@
 ChromeRenderThreadObserver::content_setting_rules() const {
   return &content_setting_rules_;
 }
 
 void ChromeRenderThreadObserver::OnFieldTrialGroupFinalized(
     const std::string& trial_name,
     const std::string& group_name) {
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_FieldTrialActivated(trial_name));
 }