Revert "Move chromecast accessibility manager."

This reverts commit 6b9a52cb.

Reason for revert: Compile failure on Fuchsia Cast Audio

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/Fuchsia%20x64%20Cast%20Audio/17815

FAILED: cast_shell exe.unstripped/cast_shell 
python "../../build/toolchain/gcc_link_wrapper.py" --output="./cast_shell" --strip="../../third_party/eu-strip/bin/eu-strip" --unstripped-file="./exe.unstripped/cast_shell" -- ../../third_party/llvm-build/Release+Asserts/bin/clang++ -Wl,--fatal-warnings -fPIC -Wl,-z,noexecstack -Wl,-z,now -Wl,-z,relro -Wl,-z,defs -Wl,--as-needed -fuse-ld=lld -Wl,--icf=all -Wl,--color-diagnostics --target=x86_64-fuchsia -resource-dir ../../third_party/fuchsia-sdk/sdk/toolchain_libs/clang/7.0.0 -Wl,-z,stack-size=0x800000 -Wl,--no-as-needed -lfdio -Wl,--as-needed -m64 -Werror -Wl,-O2 -Wl,--gc-sections -nostdlib++ --sysroot=../../third_party/fuchsia-sdk/sdk/sysroot/x86_64-fuchsia -L../../third_party/fuchsia-sdk/sdk/arch/x64/lib -o "./exe.unstripped/cast_shell" -Wl,--start-group @"./cast_shell.rsp" ./libcast_graphics_1.0.so ./libcast_external_audio_pipeline_1.0.so -Wl,--end-group   -lzircon -llaunchpad -lasync-default -lfdio -lsvc -lmedia_client 
/b/swarming/w/ir/cache/builder/src/out/Release/../../third_party/llvm-build/Release+Asserts/bin/ld.lld: error: undefined symbol: chromecast::shell::AccessibilityManager::~AccessibilityManager()
>>> referenced by cast_browser_process.cc
>>>               obj/chromecast/browser/browser/cast_browser_process.o:(chromecast::shell::CastBrowserProcess::~CastBrowserProcess())


Original change's description:
> Move chromecast accessibility manager.
> 
>   * Move the cast AccessibilityManager into
>     chromecast/browser/accessibility.
>   * Only compile and create AccessibilityManager if extensions
>     enabled.
> 
> Bug: none
> Test: manual
> Change-Id: I83c30b8259caa97093cdd48baafd26b2750d1da7
> Reviewed-on: https://chromium-review.googlesource.com/1081234
> Reviewed-by: Sadrul Chowdhury <sadrul@chromium.org>
> Reviewed-by: Kevin Schoedel <kpschoedel@chromium.org>
> Reviewed-by: Alex Sakhartchouk <alexst@chromium.org>
> Commit-Queue: Ryan Daum <rdaum@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#564692}

TBR=sadrul@chromium.org,alexst@chromium.org,kpschoedel@chromium.org,rdaum@chromium.org,rmrossi@chromium.org

Change-Id: I5f49e4b0bd32517e7fc592d3f5d89160a19e9e78
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: none
Reviewed-on: https://chromium-review.googlesource.com/1087371Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Commit-Queue: Lambros Lambrou <lambroslambrou@chromium.org>
Cr-Commit-Position: refs/heads/master@{#564726}

chromecast/browser/BUILD.gn

@@ -284,8 +284,6 @@ cast_source_set("browser") {
     ]
     if (use_aura) {
       sources += [
-        "accessibility/accessibility_manager.cc",
-        "accessibility/accessibility_manager.h",
         "cast_web_view_extension.h",
         "cast_web_view_extension.h",
         "ui/aura/accessibility/automation_manager_aura.cc",
@@ -311,7 +309,6 @@ cast_source_set("browser") {
       "//extensions/common/api",
       "//google_apis:google_apis",
       "//ui/views:views",
-      "//ui/wm/public:public",
     ]
   }
 

chromecast/browser/DEPS

@@ -49,7 +49,6 @@ include_rules = [
   "+ui/display",
   "+ui/ozone",
   "+ui/views",
-  "+ui/wm",
 
   # TODO(sanfin): Remove this by fixing the crash handler on android.
   "!chromecast/app",

chromecast/browser/cast_browser_main_parts.cc

@@ -91,8 +91,8 @@
 // gn check ignored on OverlayManagerCast as it's not a public ozone
 // header, but is exported to allow injecting the overlay-composited
 // callback.
-#include "chromecast/browser/accessibility/accessibility_manager.h"
 #include "chromecast/browser/cast_display_configurator.h"
+#include "chromecast/graphics/accessibility/accessibility_manager.h"
 #include "chromecast/graphics/cast_screen.h"
 #include "chromecast/graphics/cast_window_manager_aura.h"
 #include "components/viz/service/display/overlay_strategy_underlay_cast.h"  // nogncheck
@@ -535,16 +535,12 @@ void CastBrowserMainParts::PreMainMessageLoopRun() {
       CAST_IS_DEBUG_BUILD() ||
       GetSwitchValueBoolean(switches::kEnableInput, false));
   window_manager_->Setup();
-
-#if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS)
   cast_browser_process_->SetAccessibilityManager(
       std::make_unique<AccessibilityManager>(
           window_manager_->window_tree_host()));
-#endif  // BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS)
-
-#else   // defined(USE_AURA)
+#else
   window_manager_ = std::make_unique<CastWindowManagerDefault>();
-#endif  // defined(USE_AURA)
+#endif
 
   cast_browser_process_->SetCastService(
       cast_browser_process_->browser_client()->CreateCastService(

chromecast/browser/cast_browser_process.cc

@@ -17,7 +17,7 @@
 #include "components/prefs/pref_service.h"
 
 #if defined(USE_AURA)
-#include "chromecast/browser/accessibility/accessibility_manager.h"
+#include "chromecast/graphics/accessibility/accessibility_manager.h"
 #include "chromecast/graphics/cast_screen.h"
 #endif  // defined(USE_AURA)
 

chromecast/browser/cast_browser_process.h

@@ -19,6 +19,9 @@ class NetLog;
 }  // namespace net
 
 namespace chromecast {
+#if defined(USE_AURA)
+class AccessibilityManager;
+#endif  // defined(USE_AURA)
 class CastService;
 class CastScreen;
 class ConnectivityChecker;
@@ -28,9 +31,6 @@ class CastMetricsServiceClient;
 }  // namespace metrics
 
 namespace shell {
-#if defined(USE_AURA)
-class AccessibilityManager;
-#endif  // defined(USE_AURA)
 class CastBrowserContext;
 class CastContentBrowserClient;
 class RemoteDebuggingServer;

chromecast/browser/extensions/api/accessibility_private/accessibility_extension_api.cc

@@ -4,9 +4,9 @@
 
 #include "chromecast/browser/extensions/api/accessibility_private/accessibility_extension_api.h"
 
-#include "chromecast/browser/accessibility/accessibility_manager.h"
 #include "chromecast/browser/cast_browser_process.h"
 #include "chromecast/common/extensions_api/accessibility_private.h"
+#include "chromecast/graphics/accessibility/accessibility_manager.h"
 #include "content/public/browser/browser_accessibility_state.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/common/service_manager_connection.h"

chromecast/graphics/BUILD.gn

@@ -32,6 +32,8 @@ cast_source_set("graphics") {
       "accessibility/accessibility_highlight_layer.h",
       "accessibility/accessibility_layer.cc",
       "accessibility/accessibility_layer.h",
+      "accessibility/accessibility_manager.cc",
+      "accessibility/accessibility_manager.h",
       "accessibility/accessibility_observer.h",
       "accessibility/focus_ring_controller.cc",
       "accessibility/focus_ring_controller.h",

chromecast/browser/accessibility/accessibility_manager.cc → chromecast/graphics/accessibility/accessibility_manager.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chromecast/browser/accessibility/accessibility_manager.h"
+#include "chromecast/graphics/accessibility/accessibility_manager.h"
 
 #include "chromecast/graphics/accessibility/focus_ring_controller.h"
 #include "ui/aura/window.h"
@@ -10,7 +10,6 @@
 #include "ui/wm/public/activation_client.h"
 
 namespace chromecast {
-namespace shell {
 
 AccessibilityManager::AccessibilityManager(
     aura::WindowTreeHost* window_tree_host) {
@@ -66,5 +65,4 @@ void AccessibilityManager::SetTouchAccessibilityAnchorPoint(
   // TODO(rdaum): Implement
 }
 
-}  // namespace shell
 }  // namespace chromecast

chromecast/browser/accessibility/accessibility_manager.h → chromecast/graphics/accessibility/accessibility_manager.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROMECAST_BROWSER_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
-#define CHROMECAST_BROWSER_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
+#ifndef CHROMECAST_GRAPHICS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
+#define CHROMECAST_GRAPHICS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
 
 #include <memory>
 #include <vector>
@@ -18,8 +18,6 @@ namespace chromecast {
 
 class FocusRingController;
 
-namespace shell {
-
 // Responsible for delegating chromecast browser process accessibility functions
 // to the responsible party.
 class AccessibilityManager {
@@ -62,7 +60,6 @@ class AccessibilityManager {
       accessibility_focus_ring_controller_;
 };
 
-}  // namespace shell
 }  // namespace chromecast
 
-#endif  // CHROMECAST_BROWSER_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_
+#endif  // CHROMECAST_GRAPHICS_ACCESSIBILITY_ACCESSIBILITY_MANAGER_H_