Fix AccessibilityExtensionLoader's handling of locked screen

Previously, accessibility extensions required content scripts to access locked screen UI. With the introduction of chrome.automation, this is no longer necessary. An extension running in the signed in profile can easily access locked screen UI.

We therefore can:
- remove enabling an extension in the locked screen ui's profile (e.g. adding ChromeVox as a component extension).
- stop injection of content scripts into the locked screen's web ui.

TEST=navigate to locked screen with ChromeVox on. Verify things work. Toggle ChromeVox off and on. Verify things still work.
BUG=676467,611736
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation

Review-Url: https://codereview.chromium.org/2617633004
Cr-Commit-Position: refs/heads/master@{#442970}

chrome/browser/apps/guest_view/web_view_browsertest.cc

@@ -95,12 +95,6 @@
 #include "content/public/test/ppapi_test_utils.h"
 #endif
 
-#if defined(OS_CHROMEOS)
-#include "ash/common/accessibility_types.h"
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#include "chrome/browser/chromeos/accessibility/speech_monitor.h"
-#endif
-
 using extensions::ContextMenuMatcher;
 using extensions::ExtensionsAPIClient;
 using extensions::MenuItem;
@@ -2222,30 +2216,6 @@ IN_PROC_BROWSER_TEST_P(WebViewTest, ScreenCoordinates) {
           << message_;
 }
 
-#if defined(OS_CHROMEOS)
-// Flaky, see http://crbug.com/611736.
-IN_PROC_BROWSER_TEST_P(WebViewTest, DISABLED_ChromeVoxInjection) {
-  EXPECT_FALSE(
-      chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled());
-
-  chromeos::SpeechMonitor monitor;
-  chromeos::AccessibilityManager::Get()->EnableSpokenFeedback(
-      true, ash::A11Y_NOTIFICATION_NONE);
-  EXPECT_TRUE(monitor.SkipChromeVoxEnabledMessage());
-
-  ASSERT_TRUE(StartEmbeddedTestServer());
-  content::WebContents* guest_web_contents = LoadGuest(
-      "/extensions/platform_apps/web_view/chromevox_injection/guest.html",
-      "web_view/chromevox_injection");
-  ASSERT_TRUE(guest_web_contents);
-
-  for (;;) {
-    if (monitor.GetNextUtterance() == "chrome vox test title")
-      break;
-  }
-}
-#endif
-
 // Flaky on Windows. http://crbug.com/303966
 #if defined(OS_WIN)
 #define MAYBE_TearDownTest DISABLED_TearDownTest

chrome/browser/chromeos/accessibility/accessibility_extension_loader.h

@@ -9,11 +9,6 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 
-namespace content {
-class RenderViewHost;
-}
-
-class ExtensionService;
 class Profile;
 
 namespace chromeos {
@@ -26,35 +21,19 @@ class AccessibilityExtensionLoader {
   ~AccessibilityExtensionLoader();
 
   void SetProfile(Profile* profile, const base::Closure& done_callback);
-  void Load(Profile* profile,
-            const std::string& init_script_str,
-            const base::Closure& done_cb);
+  void Load(Profile* profile, const base::Closure& done_cb);
   void Unload();
-  void LoadToUserScreen(const base::Closure& done_cb);
-  void LoadToLockScreen(const base::Closure& done_cb);
   void LoadExtension(Profile* profile,
-                     content::RenderViewHost* render_view_host,
                      base::Closure done_cb);
 
-  bool loaded_on_lock_screen() { return loaded_on_lock_screen_; }
-
  private:
-  void InjectContentScriptAndCallback(ExtensionService* extension_service,
-                                      int render_process_id,
-                                      int render_view_id,
-                                      const base::Closure& done_cb);
-  void UnloadFromLockScreen();
   void UnloadExtensionFromProfile(Profile* profile);
 
   Profile* profile_;
   std::string extension_id_;
   base::FilePath extension_path_;
-  std::string init_script_str_;
 
-  // Profile which the extension is currently loaded to.
-  // If nullptr, it is not loaded to any profile.
-  bool loaded_on_lock_screen_;
-  bool loaded_on_user_screen_;
+  bool loaded_;
 
   base::Closure unload_callback_;
 

chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -66,7 +66,6 @@
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_ui.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_manager_connection.h"
@@ -87,7 +86,6 @@
 #include "ui/keyboard/keyboard_util.h"
 
 using content::BrowserThread;
-using content::RenderViewHost;
 using extensions::api::braille_display_private::BrailleController;
 using extensions::api::braille_display_private::DisplayState;
 using extensions::api::braille_display_private::KeyEvent;
@@ -261,7 +259,6 @@ AccessibilityManager::AccessibilityManager()
       select_to_speak_enabled_(false),
       switch_access_enabled_(false),
       spoken_feedback_notification_(ash::A11Y_NOTIFICATION_NONE),
-      should_speak_chrome_vox_announcements_on_user_screen_(true),
       system_sounds_enabled_(false),
       braille_display_connected_(false),
       scoped_braille_observer_(this),
@@ -278,9 +275,6 @@ AccessibilityManager::AccessibilityManager()
   notification_registrar_.Add(this,
                               chrome::NOTIFICATION_PROFILE_DESTROYED,
                               content::NotificationService::AllSources());
-  notification_registrar_.Add(this,
-                              chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED,
-                              content::NotificationService::AllSources());
 
   input_method::InputMethodManager::Get()->AddObserver(this);
 
@@ -483,7 +477,7 @@ void AccessibilityManager::UpdateSpokenFeedbackFromPref() {
   NotifyAccessibilityStatusChanged(details);
 
   if (enabled) {
-    chromevox_loader_->Load(profile_, "window.INJECTED_AFTER_LOAD = true;",
+    chromevox_loader_->Load(profile_,
                             base::Bind(&AccessibilityManager::PostLoadChromeVox,
                                        weak_ptr_factory_.GetWeakPtr()));
   } else {
@@ -886,8 +880,7 @@ void AccessibilityManager::UpdateSelectToSpeakFromPref() {
   select_to_speak_enabled_ = enabled;
 
   if (enabled) {
-    select_to_speak_loader_->Load(profile_, "" /* init_script_str */,
-                                  base::Closure() /* done_cb */);
+    select_to_speak_loader_->Load(profile_, base::Closure() /* done_cb */);
     select_to_speak_event_handler_.reset(
         new chromeos::SelectToSpeakEventHandler());
   } else {
@@ -1163,10 +1156,6 @@ base::TimeDelta AccessibilityManager::PlayShutdownSound() {
   return media::SoundsManager::Get()->GetDuration(SOUND_SHUTDOWN);
 }
 
-void AccessibilityManager::InjectChromeVox(RenderViewHost* render_view_host) {
-  chromevox_loader_->LoadExtension(profile_, render_view_host, base::Closure());
-}
-
 std::unique_ptr<AccessibilityStatusSubscription>
 AccessibilityManager::RegisterCallback(const AccessibilityStatusCallback& cb) {
   return callback_list_.Add(cb);
@@ -1245,9 +1234,6 @@ void AccessibilityManager::Observe(
       // Update |profile_| when entering a session.
       SetProfile(ProfileManager::GetActiveUserProfile());
 
-      // Ensure ChromeVox makes announcements at the start of new sessions.
-      should_speak_chrome_vox_announcements_on_user_screen_ = true;
-
       // Add a session state observer to be able to monitor session changes.
       if (!session_state_observer_.get() && ash::Shell::HasInstance())
         session_state_observer_.reset(
@@ -1260,19 +1246,6 @@ void AccessibilityManager::Observe(
         SetProfile(NULL);
       break;
     }
-    case chrome::NOTIFICATION_SCREEN_LOCK_STATE_CHANGED: {
-      bool is_screen_locked = *content::Details<bool>(details).ptr();
-      if (spoken_feedback_enabled_) {
-        if (is_screen_locked)
-          chromevox_loader_->LoadToLockScreen(base::Closure());
-        // If spoken feedback was enabled, make sure it is also enabled on
-        // the user screen.
-        // The status tray gets verbalized by user screen ChromeVox, so we need
-        // to load it on the user screen even if the screen is locked.
-        chromevox_loader_->LoadToUserScreen(base::Closure());
-      }
-      break;
-    }
   }
 }
 
@@ -1320,24 +1293,17 @@ void AccessibilityManager::PostLoadChromeVox() {
   // Do any setup work needed immediately after ChromeVox actually loads.
   PlayEarcon(SOUND_SPOKEN_FEEDBACK_ENABLED, PlaySoundOption::ALWAYS);
 
-  if (chromevox_loader_->loaded_on_lock_screen() ||
-      should_speak_chrome_vox_announcements_on_user_screen_) {
-    extensions::EventRouter* event_router =
-        extensions::EventRouter::Get(profile_);
-    CHECK(event_router);
-
-    std::unique_ptr<base::ListValue> event_args(new base::ListValue());
-    std::unique_ptr<extensions::Event> event(new extensions::Event(
-        extensions::events::ACCESSIBILITY_PRIVATE_ON_INTRODUCE_CHROME_VOX,
-        extensions::api::accessibility_private::OnIntroduceChromeVox::
-            kEventName,
-        std::move(event_args)));
-    event_router->DispatchEventWithLazyListener(
-        extension_misc::kChromeVoxExtensionId, std::move(event));
-  }
+  extensions::EventRouter* event_router =
+      extensions::EventRouter::Get(profile_);
+  CHECK(event_router);
 
-  should_speak_chrome_vox_announcements_on_user_screen_ =
-      chromevox_loader_->loaded_on_lock_screen();
+  std::unique_ptr<base::ListValue> event_args(new base::ListValue());
+  std::unique_ptr<extensions::Event> event(new extensions::Event(
+      extensions::events::ACCESSIBILITY_PRIVATE_ON_INTRODUCE_CHROME_VOX,
+      extensions::api::accessibility_private::OnIntroduceChromeVox::kEventName,
+      std::move(event_args)));
+  event_router->DispatchEventWithLazyListener(
+      extension_misc::kChromeVoxExtensionId, std::move(event));
 
   if (!chromevox_panel_) {
     chromevox_panel_ = new ChromeVoxPanel(profile_);

chrome/browser/chromeos/accessibility/accessibility_manager.h

@@ -26,10 +26,6 @@
 #include "extensions/browser/extension_system.h"
 #include "ui/base/ime/chromeos/input_method_manager.h"
 
-namespace content {
-class RenderViewHost;
-}
-
 class Profile;
 
 namespace chromeos {
@@ -235,9 +231,6 @@ class AccessibilityManager
   // Initiates play of shutdown sound and returns it's duration.
   base::TimeDelta PlayShutdownSound();
 
-  // Injects ChromeVox scripts into given |render_view_host|.
-  void InjectChromeVox(content::RenderViewHost* render_view_host);
-
   // Register a callback to be notified when the status of an accessibility
   // option changes.
   std::unique_ptr<AccessibilityStatusSubscription> RegisterCallback(
@@ -386,8 +379,6 @@ class AccessibilityManager
 
   ash::AccessibilityNotificationVisibility spoken_feedback_notification_;
 
-  bool should_speak_chrome_vox_announcements_on_user_screen_;
-
   bool system_sounds_enabled_;
 
   AccessibilityStatusCallbackList callback_list_;

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

@@ -74,21 +74,6 @@ bool ChromeWebViewGuestDelegate::HandleContextMenu(
   return true;
 }
 
-void ChromeWebViewGuestDelegate::OnDidInitialize() {
-#if defined(OS_CHROMEOS)
-  if (chrome::IsRunningInMash()) {
-    NOTIMPLEMENTED();
-    return;
-  }
-  chromeos::AccessibilityManager* accessibility_manager =
-      chromeos::AccessibilityManager::Get();
-  CHECK(accessibility_manager);
-  accessibility_subscription_ = accessibility_manager->RegisterCallback(
-      base::Bind(&ChromeWebViewGuestDelegate::OnAccessibilityStatusChanged,
-                 weak_ptr_factory_.GetWeakPtr()));
-#endif
-}
-
 // static
 std::unique_ptr<base::ListValue> ChromeWebViewGuestDelegate::MenuModelToValue(
     const ui::SimpleMenuModel& menu_model) {
@@ -128,35 +113,6 @@ bool ChromeWebViewGuestDelegate::ShouldHandleFindRequestsForEmbedder() const {
              chrome::kChromeUIChromeSigninURL;
 }
 
-void ChromeWebViewGuestDelegate::InjectChromeVoxIfNeeded(
-    content::RenderViewHost* render_view_host) {
-#if defined(OS_CHROMEOS)
-  if (!chromevox_injected_) {
-    chromeos::AccessibilityManager* manager =
-        chromeos::AccessibilityManager::Get();
-    if (manager && manager->IsSpokenFeedbackEnabled()) {
-      manager->InjectChromeVox(render_view_host);
-      chromevox_injected_ = true;
-    }
-  }
-#endif
-}
-
-#if defined(OS_CHROMEOS)
-void ChromeWebViewGuestDelegate::OnAccessibilityStatusChanged(
-    const chromeos::AccessibilityStatusEventDetails& details) {
-  if (details.notification_type == chromeos::ACCESSIBILITY_MANAGER_SHUTDOWN) {
-    accessibility_subscription_.reset();
-  } else if (details.notification_type ==
-      chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
-    if (details.enabled)
-      InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
-    else
-      chromevox_injected_ = false;
-  }
-}
-#endif
-
 void ChromeWebViewGuestDelegate::SetContextMenuPosition(
     const gfx::Point& position) {
   if (context_menu_position_ == nullptr)

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h

@@ -11,10 +11,6 @@
 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
 #include "extensions/browser/guest_view/web_view/web_view_guest_delegate.h"
 
-#if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
-#endif
-
 class RenderViewContextMenuBase;
 
 namespace ui {
@@ -30,7 +26,6 @@ class ChromeWebViewGuestDelegate : public WebViewGuestDelegate {
 
   // WebViewGuestDelegate implementation.
   bool HandleContextMenu(const content::ContextMenuParams& params) override;
-  void OnDidInitialize() override;
   void OnShowContextMenu(int request_id) override;
   bool ShouldHandleFindRequestsForEmbedder() const override;
 
@@ -47,14 +42,6 @@ class ChromeWebViewGuestDelegate : public WebViewGuestDelegate {
   static std::unique_ptr<base::ListValue> MenuModelToValue(
       const ui::SimpleMenuModel& menu_model);
 
-  void InjectChromeVoxIfNeeded(content::RenderViewHost* render_view_host);
-
-#if defined(OS_CHROMEOS)
-  // Notification of a change in the state of an accessibility setting.
-  void OnAccessibilityStatusChanged(
-      const chromeos::AccessibilityStatusEventDetails& details);
-#endif
-
   // A counter to generate a unique request id for a context menu request.
   // We only need the ids to be unique for a given WebViewGuest.
   int pending_context_menu_request_id_;
@@ -63,15 +50,6 @@ class ChromeWebViewGuestDelegate : public WebViewGuestDelegate {
   // shown. This is .reset() after ShowContextMenu().
   std::unique_ptr<RenderViewContextMenuBase> pending_menu_;
 
-#if defined(OS_CHROMEOS)
-  // Set to |true| if ChromeVox was already injected in main frame.
-  bool chromevox_injected_ = false;
-
-  // Subscription to receive notifications on changes to a11y settings.
-  std::unique_ptr<chromeos::AccessibilityStatusSubscription>
-      accessibility_subscription_;
-#endif
-
   WebViewGuest* const web_view_guest_;
 
   std::unique_ptr<gfx::Point> context_menu_position_;

chrome/browser/resources/chromeos/chromevox/cvox2/background/background.js

@@ -88,12 +88,6 @@ Background = function() {
    */
   this.currentRange_ = null;
 
-  /**
-   * @type {cursors.Range}
-   * @private
-   */
-  this.savedRange_ = null;
-
   // Manually bind all functions to |this|.
   for (var func in this) {
     if (typeof(this[func]) == 'function')
@@ -156,9 +150,6 @@ Background = function() {
   /** @type {!LiveRegions} @private */
   this.liveRegions_ = new LiveRegions(this);
 
-  /** @type {boolean} @private */
-  this.inExcursion_ = false;
-
   /**
    * Stores the mode as computed the last time a current range was set.
    * @type {?ChromeVoxMode}
@@ -397,9 +388,6 @@ Background.prototype = {
    * @override
    */
   setCurrentRange: function(newRange) {
-    if (!this.inExcursion_ && newRange)
-      this.savedRange_ = new cursors.Range(newRange.start, newRange.end);
-
     if (newRange && !newRange.isValid())
       return;
 

chrome/browser/resources/chromeos/chromevox/cvox2/background/keyboard_handler.js

@@ -23,6 +23,8 @@ BackgroundKeyboardHandler = function() {
 
   document.addEventListener('keydown', this.onKeyDown.bind(this), false);
   document.addEventListener('keyup', this.onKeyUp.bind(this), false);
+
+  chrome.accessibilityPrivate.setKeyboardListener(true, false);
 };
 
 BackgroundKeyboardHandler.prototype = {

chrome/test/data/extensions/platform_apps/web_view/chromevox_injection/guest.html

-<!doctype html>
-<!--
- * Copyright (c) 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.
--->
-<html>
-<head>
-  <title>ChromeVox test title</title>
-</head>
-<body>
-  <div>Some text</div>
-</body>
-</html>

chrome/test/data/extensions/platform_apps/web_view/chromevox_injection/main.html

-<!doctype html>
-<!--
- * Copyright (c) 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.
--->
-<html>
-<body>
-  <div id="webview-tag-container"></div>
-  <script src="main.js"></script>
-</body>
-</html>

chrome/test/data/extensions/platform_apps/web_view/chromevox_injection/main.js

-// 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.
-
-var startTest = function() {
-  chrome.test.sendMessage('guest-loaded');
-};
-
-chrome.test.getConfig(function(config) {
-  var guestURL = 'http://localhost:' + config.testServer.port +
-      '/extensions/platform_apps/web_view/chromevox_injection/guest.html';
-  document.querySelector('#webview-tag-container').innerHTML =
-      '<webview style="width: 10px; height: 10px; margin: 0; padding: 0;"' +
-      ' src="' + guestURL + '"' +
-      '></webview>';
-  startTest();
-});

chrome/test/data/extensions/platform_apps/web_view/chromevox_injection/manifest.json

-{
-  "name": "<webview> ChromeVox injection test.",
-  "version": "1",
-  "permissions": [
-    "webview"
-  ],
-  "app": {
-    "background": {
-      "scripts": ["test.js"]
-    }
-  }
-}

chrome/test/data/extensions/platform_apps/web_view/chromevox_injection/test.js

-// 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.
-
-chrome.app.runtime.onLaunched.addListener(function() {
-  chrome.app.window.create('main.html', {}, function () {});
-});

extensions/browser/guest_view/web_view/web_view_guest.cc

@@ -401,8 +401,6 @@ void WebViewGuest::DidInitialize(const base::DictionaryValue& create_params) {
                               content::NOTIFICATION_RESOURCE_RECEIVED_REDIRECT,
                               content::Source<WebContents>(web_contents()));
 
-  if (web_view_guest_delegate_)
-    web_view_guest_delegate_->OnDidInitialize();
   ExtensionsAPIClient::Get()->AttachWebContentsHelpers(web_contents());
   web_view_permission_helper_.reset(new WebViewPermissionHelper(this));
 

extensions/browser/guest_view/web_view/web_view_guest_delegate.h

@@ -18,9 +18,6 @@ class WebViewGuestDelegate {
   // Called when context menu operation was handled.
   virtual bool HandleContextMenu(const content::ContextMenuParams& params) = 0;
 
-  // Called just after additional initialization is performed.
-  virtual void OnDidInitialize() = 0;
-
   // Shows the context menu for the guest.
   virtual void OnShowContextMenu(int request_id) = 0;