Revert "Automatically trigger installation of high-quality speech synthesis extension."

chrome/browser/extensions/component_loader.cc

 // Copyright (c) 2012 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/extensions/component_loader.h"
 
 #include <map>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 315 matching lines @@
   Add(IDR_ENHANCED_BOOKMARKS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("enhanced_bookmark_manager")));
 #endif
 }
 
 void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
   Add(IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("network_speech_synthesis")));
 }
 
-#if defined(OS_CHROMEOS)
-void ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
-  Add(IDR_SPEECH_SYNTHESIS_MANIFEST,
-      base::FilePath(extension_misc::kSpeechSynthesisExtensionPath));
-}
-#endif
-
 void ComponentLoader::AddWithName(int manifest_resource_id,
                                   const base::FilePath& root_directory,
                                   const std::string& name) {
   std::string manifest_contents =
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           manifest_resource_id).as_string();
 
   // The Value is kept for the lifetime of the ComponentLoader. This is
   // required in case LoadAll() is called again.
   base::DictionaryValue* manifest = ParseManifest(manifest_contents);
@@ skipping 73 matching lines @@
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsForKioskMode(
     bool skip_session_components) {
   // No component extension for kiosk app launch splash screen.
   if (skip_session_components)
     return;
 
   // Component extensions needed for kiosk apps.
   AddFileManagerExtension();
-
-#if defined(OS_CHROMEOS)
-  ComponentLoader::AddChromeOsSpeechSynthesisExtension();
-#endif
 }
 
 void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages(
     bool skip_session_components) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
   // Component extensions with background pages are not enabled during tests
   // because they generate a lot of background behavior that can interfere.
   if (!enable_background_extensions_during_testing &&
       (command_line->HasSwitch(switches::kTestType) ||
@@ skipping 128 matching lines @@
         base::FilePath(FILE_PATH_LITERAL("google_now")));
   }
 #endif
 
 #if defined(GOOGLE_CHROME_BUILD)
 #if !defined(OS_CHROMEOS)  // http://crbug.com/314799
   AddNetworkSpeechSynthesisExtension();
 #endif
 #endif  // defined(GOOGLE_CHROME_BUILD)
 
-#if defined(OS_CHROMEOS)
-  AddChromeOsSpeechSynthesisExtension();
-#endif  // defined(OS_CHROMEOS)
-
 #if defined(ENABLE_PLUGINS)
   base::FilePath pdf_path;
   content::PluginService* plugin_service =
       content::PluginService::GetInstance();
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kOutOfProcessPdf) &&
       PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_path) &&
       plugin_service->GetRegisteredPpapiPluginInfo(pdf_path)) {
     Add(IDR_PDF_MANIFEST, base::FilePath(FILE_PATH_LITERAL("pdf")));
   }
 #endif
 }
 
 void ComponentLoader::UnloadComponent(ComponentExtensionInfo* component) {
   delete component->manifest;
   if (extension_service_->is_ready()) {
     extension_service_->
         RemoveComponentExtension(component->extension_id);
   }
 }
 
 }  // namespace extensions