Revert of Move ChromeVox loading out of ComponentLoader.

chrome/browser/chromeos/accessibility/accessibility_manager.cc

 // Copyright (c) 2013 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/accessibility_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 209 matching lines @@
       extensions::ExtensionSystem::Get(profile)->extension_service();
   if (render_view_host) {
     // Wrap the passed in callback to inject the content script.
     done_cb = base::Bind(
         &InjectChromeVoxContentScript,
         extension_service,
         render_view_host->GetProcess()->GetID(),
         render_view_host->GetRoutingID(),
         done_cb);
   }
-
-  extension_service->component_loader()->AddComponentFromDir(
-      GetChromeVoxPath(), extension_misc::kChromeVoxExtensionId, done_cb);
+  extension_service->component_loader()->AddChromeVoxExtension(done_cb);
 }
 
 void InjectChromeVoxContentScript(
     ExtensionService* extension_service,
     int render_process_id,
     int render_view_id,
     const base::Closure& done_cb) {
   // Make sure to always run |done_cb|.  ChromeVox was loaded even if we end up
   // not injecting into this particular render view.
   base::ScopedClosureRunner done_runner(done_cb);
@@ skipping 1300 matching lines @@
     content::BrowserContext* context) {
   keyboard_listener_extension_id_ = id;
 
   extensions::ExtensionRegistry* registry =
       extensions::ExtensionRegistry::Get(context);
   if (!extension_registry_observer_.IsObserving(registry) && !id.empty())
     extension_registry_observer_.Add(registry);
 }
 
 }  // namespace chromeos