Merge 157744 - [net] Enable async DNS field trial on CrOS (canary+dev channels).

chrome/browser/net/async_dns_field_trial.cc

Index: chrome/browser/net/async_dns_field_trial.cc
===================================================================
--- chrome/browser/net/async_dns_field_trial.cc	(revision 157790)
+++ chrome/browser/net/async_dns_field_trial.cc	(working copy)
@@ -11,20 +11,21 @@
 namespace chrome_browser_net {
 
 bool ConfigureAsyncDnsFieldTrial() {
-#if defined(OS_ANDROID) || defined(OS_IOS) || defined(OS_CHROMEOS)
+#if defined(OS_ANDROID) || defined(OS_IOS)
   // There is no DnsConfigService on those platforms so disable the field trial.
   return false;
 #endif
   const base::FieldTrial::Probability kAsyncDnsDivisor = 100;
   base::FieldTrial::Probability enabled_probability = 0;
 
-  // TODO(szym): expand to DEV channel after fixing http://crbug.com/121085
-  if (chrome::VersionInfo::GetChannel() <= chrome::VersionInfo::CHANNEL_CANARY)
-    enabled_probability = 0;
+#if defined(OS_CHROMEOS)
+  if (chrome::VersionInfo::GetChannel() <= chrome::VersionInfo::CHANNEL_DEV)
+    enabled_probability = 50;
+#endif
 
   scoped_refptr<base::FieldTrial> trial(
       base::FieldTrialList::FactoryGetFieldTrial(
-          "AsyncDns", kAsyncDnsDivisor, "disabled", 2012, 9, 30, NULL));
+          "AsyncDns", kAsyncDnsDivisor, "disabled", 2012, 10, 30, NULL));
 
   int enabled_group = trial->AppendGroup("enabled", enabled_probability);
   return trial->group() == enabled_group;