Remove debug instrumentation for crbug.com/359406.

chrome/browser/metrics/field_trial_synchronizer.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/browser/metrics/field_trial_synchronizer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/threading/thread.h"
-#include "chrome/common/chrome_constants.h"
 #include "chrome/common/render_messages.h"
 #include "components/variations/variations_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 using content::BrowserThread;
 
 namespace {
 
 // This singleton instance should be constructed during the single threaded
@@ skipping 12 matching lines @@
   variations::SetVariationListCrashKeys();
 }
 
 void FieldTrialSynchronizer::NotifyAllRenderers(
     const std::string& field_trial_name,
     const std::string& group_name) {
   // To iterate over RenderProcessHosts, or to send messages to the hosts, we
   // need to be on the UI thread.
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  // 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 = base::Process::Current().Pid();
   for (content::RenderProcessHost::iterator it(
           content::RenderProcessHost::AllHostsIterator());
        !it.IsAtEnd(); it.Advance()) {
     it.GetCurrentValue()->Send(new ChromeViewMsg_SetFieldTrialGroup(
-        field_trial_name, group_name, sender_pid,
-        base::FieldTrialList::GetDebugToken()));
+        field_trial_name, group_name));
   }
 }
 
 void FieldTrialSynchronizer::OnFieldTrialGroupFinalized(
     const std::string& field_trial_name,
     const std::string& group_name) {
-  // TODO(asvitkine): Remove these CHECKs once http://crbug.com/359406 is fixed.
-  CHECK(!field_trial_name.empty() && !group_name.empty());
-  CHECK_EQ(group_name, base::FieldTrialList::FindFullName(field_trial_name))
-      << field_trial_name << ":" << group_name << "=>"
-      << base::FieldTrialList::FindFullName(field_trial_name);
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&FieldTrialSynchronizer::NotifyAllRenderers,
                  this,
                  field_trial_name,
                  group_name));
   variations::SetVariationListCrashKeys();
 }
 
 FieldTrialSynchronizer::~FieldTrialSynchronizer() {
   base::FieldTrialList::RemoveObserver(this);
   g_field_trial_synchronizer = NULL;
 }