summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
Diffstat (limited to 'base')
-rw-r--r--base/base_lib.scons1
-rw-r--r--base/field_trial.h5
2 files changed, 5 insertions, 1 deletions
diff --git a/base/base_lib.scons b/base/base_lib.scons
index 17c3543..3019e02 100644
--- a/base/base_lib.scons
+++ b/base/base_lib.scons
@@ -39,6 +39,7 @@ input_files = [
'command_line.cc',
'debug_util.cc',
'event_recorder.cc',
+ 'field_trial.cc',
'file_path.cc',
'file_util.cc',
'file_version_info.cc',
diff --git a/base/field_trial.h b/base/field_trial.h
index e70ab1a..a812d4d 100644
--- a/base/field_trial.h
+++ b/base/field_trial.h
@@ -71,7 +71,10 @@ class FieldTrialList : NonThreadSafe {
// 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: