Load the Chrome OS TTS engine manifest from the file system isntead of resources.

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 <string>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/search/hotword_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_l10n_util.h"
 #include "extensions/common/file_util.h"
 #include "extensions/common/manifest_constants.h"
 #include "grit/browser_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
 #if defined(OS_CHROMEOS)
 #include "components/chrome_apps/grit/chrome_apps_resources.h"
@@ skipping 38 matching lines @@
   std::string id_input;
   CHECK(manifest->GetString(manifest_keys::kPublicKey, &raw_key));
   CHECK(Extension::ParsePEMKeyBytes(raw_key, &id_input));
   std::string id = crx_file::id_util::GenerateId(id_input);
   return id;
 }
 
 #if defined(OS_CHROMEOS)
 scoped_ptr<base::DictionaryValue>
 LoadManifestOnFileThread(
-    const base::FilePath& chromevox_path, const char* manifest_filename) {
+    const base::FilePath& root_directory,
+    const base::FilePath::CharType* manifest_filename) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::FILE);
   std::string error;
   scoped_ptr<base::DictionaryValue> manifest(
-      file_util::LoadManifest(chromevox_path, manifest_filename, &error));
-  CHECK(manifest) << error;
+      file_util::LoadManifest(root_directory, manifest_filename, &error));
+  if (!manifest) {
+    LOG(ERROR) << "Can't load "
+               << root_directory.Append(manifest_filename).AsUTF8Unsafe()
+               << ": " << error;
+    return nullptr;
+  }
   bool localized = extension_l10n_util::LocalizeExtension(
-      chromevox_path, manifest.get(), &error);
+      root_directory, manifest.get(), &error);
   CHECK(localized) << error;
   return manifest.Pass();
 }
 
 bool IsNormalSession() {
   return !base::CommandLine::ForCurrentProcess()->HasSwitch(
              chromeos::switches::kGuestSession) &&
          user_manager::UserManager::IsInitialized() &&
          user_manager::UserManager::Get()->IsUserLoggedIn();
 }
@@ skipping 280 matching lines @@
 }
 
 void ComponentLoader::AddNetworkSpeechSynthesisExtension() {
   Add(IDR_NETWORK_SPEECH_SYNTHESIS_MANIFEST,
       base::FilePath(FILE_PATH_LITERAL("network_speech_synthesis")));
 }
 
 #if defined(OS_CHROMEOS)
 void ComponentLoader::AddChromeVoxExtension(
     const base::Closure& done_cb) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   base::FilePath resources_path;
-  PathService::Get(chrome::DIR_RESOURCES, &resources_path);
+  CHECK(PathService::Get(chrome::DIR_RESOURCES, &resources_path));
 
   base::FilePath chromevox_path =
       resources_path.Append(extension_misc::kChromeVoxExtensionPath);
 
-  const char* manifest_filename =
-      IsNormalSession() ? extension_misc::kChromeVoxManifestFilename
-                        : extension_misc::kChromeVoxGuestManifestFilename;
-
-  BrowserThread::PostTaskAndReplyWithResult(
-      BrowserThread::FILE,
-      FROM_HERE,
-      base::Bind(&LoadManifestOnFileThread, chromevox_path, manifest_filename),
-      base::Bind(&ComponentLoader::AddChromeVoxExtensionWithManifest,
-                 weak_factory_.GetWeakPtr(),
-                 chromevox_path,
-                 done_cb));
+  const base::FilePath::CharType* manifest_filename =
+      IsNormalSession() ? extensions::kManifestFilename
+                        : extension_misc::kGuestManifestFilename;
+  AddWithManifestFile(
+      manifest_filename,
+      chromevox_path,
+      extension_misc::kChromeVoxExtensionId,
+      done_cb);
 }
 
-void ComponentLoader::AddChromeVoxExtensionWithManifest(
-    const base::FilePath& chromevox_path,
-    const base::Closure& done_cb,
-    scoped_ptr<base::DictionaryValue> manifest) {
-  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-  std::string extension_id = Add(manifest.release(), chromevox_path, false);
-  CHECK_EQ(extension_misc::kChromeVoxExtensionId, extension_id);
-  if (!done_cb.is_null())
-    done_cb.Run();
-}
-
-std::string ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
-  int idr = IsNormalSession() ? IDR_SPEECH_SYNTHESIS_MANIFEST
-                              : IDR_SPEECH_SYNTHESIS_GUEST_MANIFEST;
-  std::string id = Add(idr,
-      base::FilePath(extension_misc::kSpeechSynthesisExtensionPath));
-  EnableFileSystemInGuestMode(id);
-  return id;
+void ComponentLoader::AddChromeOsSpeechSynthesisExtension() {
+  const base::FilePath::CharType* manifest_filename =
+      IsNormalSession() ? extensions::kManifestFilename
+                        : extension_misc::kGuestManifestFilename;
+  AddWithManifestFile(
+      manifest_filename,
+      base::FilePath(extension_misc::kSpeechSynthesisExtensionPath),
+      extension_misc::kSpeechSynthesisExtensionId,
+      base::Bind(&ComponentLoader::EnableFileSystemInGuestMode,
+                 weak_factory_.GetWeakPtr(),
+                 extension_misc::kChromeVoxExtensionId));
 }
 #endif
 
 void ComponentLoader::AddWithNameAndDescription(
     int manifest_resource_id,
     const base::FilePath& root_directory,
     int name_string_id,
     int description_string_id) {
   if (!ignore_whitelist_for_testing_ &&
       !IsComponentExtensionWhitelisted(manifest_resource_id))
@@ skipping 264 matching lines @@
     GURL site = content::SiteInstance::GetSiteForURL(
         off_the_record_context, Extension::GetBaseURLFromExtensionId(id));
     storage::FileSystemContext* file_system_context =
         content::BrowserContext::GetStoragePartitionForSite(
             off_the_record_context, site)->GetFileSystemContext();
     file_system_context->EnableTemporaryFileSystemInIncognito();
   }
 #endif
 }
 
+#if defined(OS_CHROMEOS)
+void ComponentLoader::AddWithManifestFile(
+    const base::FilePath::CharType* manifest_filename,
+    const base::FilePath& root_directory,
+    const char* extension_id,
+    const base::Closure& done_cb) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  BrowserThread::PostTaskAndReplyWithResult(
+      BrowserThread::FILE,
+      FROM_HERE,
+      base::Bind(&LoadManifestOnFileThread, root_directory, manifest_filename),
+      base::Bind(&ComponentLoader::FinishAddWithManifestFile,
+                 weak_factory_.GetWeakPtr(),
+                 root_directory,
+                 extension_id,
+                 done_cb));
+}
+
+void ComponentLoader::FinishAddWithManifestFile(
+    const base::FilePath& root_directory,
+    const char* extension_id,
+    const base::Closure& done_cb,
+    scoped_ptr<base::DictionaryValue> manifest) {
+  DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+  if (!manifest)
+    return;  // Error already logged.
+  std::string actual_extension_id = Add(
+      manifest.release(),
+      root_directory,
+      false);
+  CHECK_EQ(extension_id, actual_extension_id);
+  if (!done_cb.is_null())
+    done_cb.Run();
+}
+#endif
+
 }  // namespace extensions