Clean up filter and content encoding handling ...

base/field_trial.h

 // Copyright (c) 2006-2008 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.
 
 // FieldTrial is a class for handling details of statistical experiments
 // performed by actual users in the field (i.e., in a shipped or beta product).
 // All code is called exclusively on the UI thread currently.
 //
 // The simplest example is a test to see whether one of two options produces
 // "better" results across our user population.  In that scenario, UMA data
@@ skipping 53 matching lines @@
   // The Find() method can be used to test to see if a named Trial was already
   // registered, or to retrieve a pointer to it from the global map.
   static FieldTrial* Find(const std::wstring& name);
 
   // The time of construction of the global map is recorded in a static variable
   // and is commonly used by experiments to identify the time since the start
   // of the application.  In some experiments it may be useful to discount
   // data that is gathered before the application has reach sufficient
   // stability (example: most DLL have loaded, etc.)
   static Time application_start_time() {
-    return global_->application_start_time_;
+    if (global_)
+      return global_->application_start_time_;
+    // For testing purposes only, or when we don't yet have a start time.
+    return Time::Now();
   }
 
  private:
   typedef std::map<std::wstring, FieldTrial*> RegistrationList;
 
   friend class FieldTrialTest;
   static void ResetConstructorCountForTestingOnly() { constructor_count_ = 0; }
 
   static FieldTrialList* global_;  // The singleton of this class.
   static int constructor_count_;   // Prevent having more than one.
 
   Time application_start_time_;
   RegistrationList registered_;
 
   DISALLOW_COPY_AND_ASSIGN(FieldTrialList);
 };
 
 #endif  // BASE_FIELD_TRIAL_H_