Snapshot of all changes to get jumbo in blink and content.

content/browser/speech/endpointer/endpointer.cc

Index: content/browser/speech/endpointer/endpointer.cc
diff --git a/content/browser/speech/endpointer/endpointer.cc b/content/browser/speech/endpointer/endpointer.cc
index 1758970ee11e522d2311e5b15154af3bc203e665..59bdbf4b8a0a503d290751d670ad63a73f22ea53 100644
--- a/content/browser/speech/endpointer/endpointer.cc
+++ b/content/browser/speech/endpointer/endpointer.cc
@@ -7,7 +7,7 @@
 #include "base/time/time.h"
 #include "content/browser/speech/audio_buffer.h"
 
-using base::Time;
+//using base::Time; // Collides with typedef Time in X11
 
 namespace {
 const int kFrameRate = 50;  // 1 frame = 20ms of audio.
@@ -26,13 +26,13 @@ Endpointer::Endpointer(int sample_rate)
   frame_size_ = static_cast<int>(sample_rate / static_cast<float>(kFrameRate));
 
   speech_input_minimum_length_us_ =
-      static_cast<int64_t>(1.7 * Time::kMicrosecondsPerSecond);
+    static_cast<int64_t>(1.7 * base::Time::kMicrosecondsPerSecond);
   speech_input_complete_silence_length_us_ =
-      static_cast<int64_t>(0.5 * Time::kMicrosecondsPerSecond);
+    static_cast<int64_t>(0.5 * base::Time::kMicrosecondsPerSecond);
   long_speech_input_complete_silence_length_us_ = -1;
   long_speech_length_us_ = -1;
   speech_input_possibly_complete_silence_length_us_ =
-      1 * Time::kMicrosecondsPerSecond;
+    1 * base::Time::kMicrosecondsPerSecond;
 
   // Set the default configuration for Push To Talk mode.
   EnergyEndpointerParams ep_config;
@@ -105,7 +105,7 @@ EpStatus Endpointer::ProcessAudio(const AudioChunk& raw_audio, float* rms_out) {
                                          frame_size_,
                                          rms_out);
     sample_index += frame_size_;
-    audio_frame_time_us_ += (frame_size_ * Time::kMicrosecondsPerSecond) /
+    audio_frame_time_us_ += (frame_size_ * base::Time::kMicrosecondsPerSecond) /
                          sample_rate_;
 
     // Get the status of the endpointer.