Add a switch for faking channels for Variations filtering.

chrome/browser/metrics/variations/variations_service.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/variations/variations_service.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/build_time.h"
@@ skipping 42 matching lines @@
     case Study_Channel_BETA:
       return chrome::VersionInfo::CHANNEL_BETA;
     case Study_Channel_STABLE:
       return chrome::VersionInfo::CHANNEL_STABLE;
   }
   // All enum values of |study_channel| were handled above.
   NOTREACHED();
   return chrome::VersionInfo::CHANNEL_UNKNOWN;
 }
 
+// Wrapper around channel checking, used to enable channel mocking for
+// testing. If the current browser channel is not UNKNOWN, this will return
+// that channel value. Otherwise, if the fake channel flag is provided, this
+// will return the fake channel. Failing that, this will return the UNKNOWN
+// channel.
+chrome::VersionInfo::Channel GetChannelForVariations() {
+  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
+  if (channel != chrome::VersionInfo::CHANNEL_UNKNOWN)
+    return channel;
+  std::string forced_channel =
+      CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+          switches::kFakeVariationsChannel);
+  if (forced_channel == "stable")
+    channel = chrome::VersionInfo::CHANNEL_STABLE;
+  else if (forced_channel == "beta")
+    channel = chrome::VersionInfo::CHANNEL_BETA;
+  else if (forced_channel == "dev")
+    channel = chrome::VersionInfo::CHANNEL_DEV;
+  else if (forced_channel == "canary")
+    channel = chrome::VersionInfo::CHANNEL_CANARY;
+  else
+    DVLOG(1) << "Invalid channel provided: " << forced_channel;
+  return channel;
+}
+
 Study_Platform GetCurrentPlatform() {
 #if defined(OS_WIN)
   return Study_Platform_PLATFORM_WINDOWS;
 #elif defined(OS_MACOSX)
   return Study_Platform_PLATFORM_MAC;
 #elif defined(OS_CHROMEOS)
   return Study_Platform_PLATFORM_CHROMEOS;
 #elif defined(OS_ANDROID)
   return Study_Platform_PLATFORM_ANDROID;
 #elif defined(OS_IOS)
@@ skipping 56 matching lines @@
   // Use the build time for date checks if either the seed date is invalid or
   // the build time is newer than the seed date.
   base::Time reference_date = seed_date;
   if (seed_date.is_null() || seed_date < build_time)
     reference_date = build_time;
 
   const chrome::VersionInfo current_version_info;
   if (!current_version_info.is_valid())
     return false;
 
+  chrome::VersionInfo::Channel channel = GetChannelForVariations();
   for (int i = 0; i < seed.study_size(); ++i) {
-    if (ShouldAddStudy(seed.study(i), current_version_info, reference_date))
+    if (ShouldAddStudy(seed.study(i), current_version_info, reference_date,
+            channel))
       CreateTrialFromStudy(seed.study(i), reference_date);

[Alexei Svitkine (slow), 2013/01/04 20:32:16]

Nit: Align |channel| with seed.study(i) and add {}'s.

[SteveT, 2013/01/07 15:43:05]

I had a feeling this curly issue would come up. I thought you preferred avoiding
{}s in the case where the statement is one line, but the if condition spans
multiple?

Fixed based on this comment.

[Alexei Svitkine (slow), 2013/01/07 15:51:43]

The rule I follow is if either if statement or body spans more than one line,
add them. 

   }
 
   return true;
 }
 
 void VariationsService::StartRepeatedVariationsSeedFetch() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
   // Check that |CreateTrialsFromSeed| was called, which is necessary to
   // retrieve the serial number that will be sent to the server.
@@ skipping 121 matching lines @@
   local_prefs->SetInt64(prefs::kVariationsSeedDate,
                         seed_date.ToInternalValue());
   variations_serial_number_ = seed.serial_number();
   return true;
 }
 
 // static
 bool VariationsService::ShouldAddStudy(
     const Study& study,
     const chrome::VersionInfo& version_info,
-    const base::Time& reference_date) {
+    const base::Time& reference_date,
+    const chrome::VersionInfo::Channel channel) {
   if (study.has_filter()) {
-    if (!CheckStudyChannel(study.filter(), chrome::VersionInfo::GetChannel())) {
+    if (!CheckStudyChannel(study.filter(), channel)) {
       DVLOG(1) << "Filtered out study " << study.name() << " due to channel.";
       return false;
     }
 
     if (!CheckStudyLocale(study.filter(),
                           g_browser_process->GetApplicationLocale())) {
       DVLOG(1) << "Filtered out study " << study.name() << " due to locale.";
       return false;
     }
 
@@ skipping 215 matching lines @@
                                       variation_id);
     }
   }
 
   trial->SetForced();
   if (IsStudyExpired(study, reference_date))
     trial->Disable();
 }
 
 }  // namespace chrome_variations