Index: chrome/browser/metrics/field_trial_synchronizer.cc |
diff --git a/chrome/browser/metrics/field_trial_synchronizer.cc b/chrome/browser/metrics/field_trial_synchronizer.cc |
index 9c32351bdef022ca2400b23facd2ba97f87596fd..842f25db6d6156577dc889f860a1964e362a74b8 100644 |
--- a/chrome/browser/metrics/field_trial_synchronizer.cc |
+++ b/chrome/browser/metrics/field_trial_synchronizer.cc |
@@ -7,7 +7,6 @@ |
#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" |
@@ -40,28 +39,17 @@ void FieldTrialSynchronizer::NotifyAllRenderers( |
// 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, |