Allows browser tests to run with recent change

chrome/browser/chromeos/boot_times_loader.cc

 // Copyright (c) 2009 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/chromeos/boot_times_loader.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
 #include "base/thread.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/common/chrome_switches.h"
 
 namespace chromeos {
 
 // Beginning of line we look for that gives version number.
 static const char kPrefix[] = "CHROMEOS_RELEASE_DESCRIPTION=";
 
 // File to look for version number in.
 static const char kVersionPath[] = "/etc/lsb-release";
 
 // File uptime logs are located in.
 static const char kLogPath[] = "/tmp";
 
 BootTimesLoader::BootTimesLoader() : backend_(new Backend()) {
 }
 
 BootTimesLoader::Handle BootTimesLoader::GetBootTimes(
     CancelableRequestConsumerBase* consumer,
     BootTimesLoader::GetBootTimesCallback* callback) {
   if (!g_browser_process->file_thread()) {
     // This should only happen if Chrome is shutting down, so we don't do
     // anything.
     return 0;
   }
 
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (command_line.HasSwitch(switches::kTestType)) {
+    // TODO(davemoore) This avoids boottimes for tests. This needs to be
+    // replaced with a mock of BootTimesLoader.
+    return 0;
+  }
+
   scoped_refptr<CancelableRequest<GetBootTimesCallback> > request(
       new CancelableRequest<GetBootTimesCallback>(callback));
   AddRequest(request, consumer);
 
   g_browser_process->file_thread()->message_loop()->PostTask(
       FROM_HERE,
       NewRunnableMethod(backend_.get(), &Backend::GetBootTimes, request));
   return request->handle();
 }
 
@@ skipping 82 matching lines @@
   GetUptime(kXStarted, &boot_times.x_started);
   GetUptime(kChromeExec, &boot_times.chrome_exec);
   GetUptime(kChromeMain, &boot_times.chrome_main);
   GetUptime(kLoginPromptReady, &boot_times.login_prompt_ready);
 
   request->ForwardResult(
       GetBootTimesCallback::TupleType(request->handle(), boot_times));
 }
 
 }  // namespace chromeos