Revert of Make ChromeVox Next the default ChromeVox experience

chrome/browser/chromeos/accessibility/speech_monitor.cc

 // Copyright 2014 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/accessibility/speech_monitor.h"
 
 namespace chromeos {
 
 namespace {
 const char kChromeVoxEnabledMessage[] = "chrome vox spoken feedback is ready";
-const char kChromeVoxUpdateNotificationMessage[] =
-    "n to learn more about chrome vox Next.";
 }  // anonymous namespace
 
 SpeechMonitor::SpeechMonitor() {
   TtsController::GetInstance()->SetPlatformImpl(this);
 }
 
 SpeechMonitor::~SpeechMonitor() {
   TtsController::GetInstance()->SetPlatformImpl(TtsPlatformImpl::GetInstance());
 }
 
 std::string SpeechMonitor::GetNextUtterance() {
   if (utterance_queue_.empty()) {
     loop_runner_ = new content::MessageLoopRunner();
     loop_runner_->Run();
     loop_runner_ = NULL;
   }
   std::string result = utterance_queue_.front();
   utterance_queue_.pop_front();
   return result;
 }
 
 bool SpeechMonitor::SkipChromeVoxEnabledMessage() {
-  bool saw_enabled_message = false;
-  bool saw_update_message = false;
   while (true) {
     if (utterance_queue_.empty()) {
       loop_runner_ = new content::MessageLoopRunner();
       loop_runner_->Run();
       loop_runner_ = NULL;
     }
     std::string result = utterance_queue_.front();
     utterance_queue_.pop_front();
-    saw_enabled_message |= result == kChromeVoxEnabledMessage;
-    saw_update_message |= result == kChromeVoxUpdateNotificationMessage;
-    if (saw_enabled_message && saw_update_message)
+    if (result == kChromeVoxEnabledMessage)
       return true;
   }
   return false;
 }
 
 bool SpeechMonitor::PlatformImplAvailable() {
   return true;
 }
 
 bool SpeechMonitor::Speak(
@@ skipping 37 matching lines @@
   if (utterance->text() == "")
     return;
 
   VLOG(0) << "Speaking " << utterance->text();
   utterance_queue_.push_back(utterance->text());
   if (loop_runner_.get())
     loop_runner_->Quit();
 }
 
 }  // namespace chromeos