[fuchsia] Move //fuchsia/engine/ to //fuchsia_web/webengine/

Also move fuchsia/engine/web_instance_host/ to
fuchsia_web/webinstance_host/.

All changes were mechanical except for DEPS files.

Bug: 1081525
Change-Id: I9aca303f95dc1dd6ade833ea0532127dd389a4a2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3628363
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: David Dorwin <ddorwin@chromium.org>
Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Reviewed-by: Matt Mueller <mattm@chromium.org>
Reviewed-by: Wez <wez@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Owners-Override: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1010748}

PRESUBMIT.py

@@ -925,8 +925,8 @@ _BANNED_CPP_FUNCTIONS : Sequence[BanRule] = (
       ),
       False,
       (
-        r'^fuchsia/engine/browser/url_request_rewrite_rules_manager\.cc$',
+        r'^fuchsia_web/webengine/browser/url_request_rewrite_rules_manager\.cc$',
-        r'^fuchsia/engine/url_request_rewrite_type_converters\.cc$',
+        r'^fuchsia_web/webengine/url_request_rewrite_type_converters\.cc$',
         r'^third_party/blink/.*\.(cc|h)$',
         r'^content/renderer/.*\.(cc|h)$',
       ),

build/fuchsia/cipd/BUILD.gn

@@ -215,8 +215,9 @@ cipd_archive("web_engine") {
   package_subdirectory = _web_engine_directory
   description = "Prebuilt WebEngine binaries for Fuchsia."
 
-  deps = [ "//fuchsia/engine:web_engine" ]
+  deps = [ "//fuchsia_web/webengine:web_engine" ]
-  sources = [ "${root_gen_dir}/fuchsia/engine/web_engine/web_engine.far" ]
+  sources =
+      [ "${root_gen_dir}/fuchsia_web/webengine/web_engine/web_engine.far" ]
 }
 
 cipd_archive("cast_runner") {
@@ -233,9 +234,8 @@ cipd_archive("web_engine_shell") {
   description = "Simple command-line embedder for WebEngine."
   testonly = true
 
-  deps = [ "//fuchsia/engine:web_engine_shell_pkg" ]
+  deps = [ "//fuchsia_web/webengine:web_engine_shell_pkg" ]
-  sources =
+  sources = [ "${root_gen_dir}/fuchsia_web/webengine/web_engine_shell/web_engine_shell.far" ]
-      [ "${root_gen_dir}/fuchsia/engine/web_engine_shell/web_engine_shell.far" ]
 }
 
 _stripped_chromedriver_file = "${root_out_dir}/clang_x64/stripped/chromedriver"
@@ -278,9 +278,9 @@ cipd_test_archive("tests") {
 
   deps = [
     "//base:base_unittests_pkg",
-    "//fuchsia/engine:web_engine_integration_tests_pkg",
     "//fuchsia_web/runners:cast_runner_integration_tests_pkg",
     "//fuchsia_web/runners:web_runner_integration_tests_pkg",
+    "//fuchsia_web/webengine:web_engine_integration_tests_pkg",
     "//ipc:ipc_tests_pkg",
     "//media:media_unittests_pkg",
     "//mojo:mojo_unittests_pkg",
@@ -298,9 +298,9 @@ cipd_test_archive("tests") {
         "${root_gen_dir}/third_party/blink/common/blink_common_unittests/blink_common_unittests.far",
       ]
       cfv1_far_sources = [
-        "${root_gen_dir}/fuchsia/engine/web_engine_integration_tests/web_engine_integration_tests.far",
         "${root_gen_dir}/fuchsia_web/runners/cast_runner_integration_tests/cast_runner_integration_tests.far",
         "${root_gen_dir}/fuchsia_web/runners/web_runner_integration_tests/web_runner_integration_tests.far",
+        "${root_gen_dir}/fuchsia_web/webengine/web_engine_integration_tests/web_engine_integration_tests.far",
         "${root_gen_dir}/media/media_unittests/media_unittests.far",
         "${root_gen_dir}/skia/skia_unittests/skia_unittests.far",
       ]
@@ -321,8 +321,8 @@ cipd_test_archive("tests") {
     {
       manifest_path = "${target_gen_dir}/web_engine_tests_manifest.json"
       cfv1_far_sources = [
-        "${root_gen_dir}/fuchsia/engine/web_engine_integration_tests/web_engine_integration_tests.far",
         "${root_gen_dir}/fuchsia_web/runners/web_runner_integration_tests/web_runner_integration_tests.far",
+        "${root_gen_dir}/fuchsia_web/webengine/web_engine_integration_tests/web_engine_integration_tests.far",
       ]
     },
     {

chrome/test/BUILD.gn

@@ -729,8 +729,8 @@ if (is_android) {
     ]
     if (fuchsia_browser_type == "web_engine_shell") {
       data_deps += [
-        "//fuchsia/engine:web_engine_shell",
+        "//fuchsia_web/webengine:web_engine_shell",
-        "//fuchsia/engine:web_engine_with_webui_installer",
+        "//fuchsia_web/webengine:web_engine_with_webui_installer",
       ]
     }
     data_deps += [ "//chrome/app:chrome_fuchsia" ]

components/fuchsia_component_support/BUILD.gn

@@ -12,8 +12,9 @@ source_set("fuchsia_component_support") {
   visibility += [
     ":unit_tests",
     "//chromecast/internal/*",
-    "//fuchsia/engine/*",
     "//fuchsia_web/runners/*",
+    "//fuchsia_web/webengine/*",
+    "//fuchsia_web/webinstance_host/*",
   ]
   public = [
     "config_reader.h",

components/fuchsia_legacymetrics/BUILD.gn

@@ -10,7 +10,7 @@ source_set("fuchsia_legacymetrics") {
   visibility += [
     ":unit_tests",
     "//chromecast/internal/*",
-    "//fuchsia/engine/*",
+    "//fuchsia_web/webengine/*",
   ]
   sources = [
     "legacymetrics_client.cc",

content/test/BUILD.gn

@@ -769,7 +769,7 @@ static_library("test_support") {
 if (is_fuchsia) {
   # TODO(crbug.com/1310086): Split this test suite into chrome/WebEngine
   # versions.
-  # TODO(crbug.com/1309686): Move WebEngine-specific suites to //fuchsia/engine
+  # TODO(crbug.com/1309686): Move WebEngine-specific suites to //fuchsia_web/webengine/
   group("performance_web_engine_test_suite") {
     testonly = true
     data = [ "//content/test/gpu/run_telemetry_benchmark_fuchsia.py" ]
@@ -786,8 +786,8 @@ if (is_fuchsia) {
     data = [ "//content/test/gpu/fuchsia_util.py" ]
     data_deps = [
       "//chrome/app:chrome_fuchsia",
-      "//fuchsia/engine:web_engine_shell",
+      "//fuchsia_web/webengine:web_engine_shell",
-      "//fuchsia/engine:web_engine_with_webui_installer",
+      "//fuchsia_web/webengine:web_engine_with_webui_installer",
     ]
   }
 }

content/test/gpu/fuchsia_util.py

@@ -38,8 +38,8 @@ def RunTestOnFuchsiaDevice(script_cmd):
 
   if runner_script_args.browser == 'web-engine-shell':
     package_names = ['web_engine_with_webui', 'web_engine_shell']
-    package_dir = os.path.join(runner_script_args.out_dir, 'gen', 'fuchsia',
+    package_dir = os.path.join(runner_script_args.out_dir, 'gen', 'fuchsia_web',
-                               'engine')
+                               'webengine')
   else:
     package_names = ['chrome']
     package_dir = os.path.join(runner_script_args.out_dir, 'gen', 'chrome',

docs/fuchsia/gpu_testing.md

@@ -5,7 +5,7 @@
 General instruction on running and debugging GPU integration tests can be
 found [here](../gpu/gpu_testing.md).
 
-Fuchsia uses either [web_engine_shell](../../fuchsia/engine/test/README.md)
+Fuchsia uses either [web_engine_shell](../../fuchsia_web/webengine/test/README.md)
 or the Chrome browser to run GPU integration tests. For the sake of this
 example, we will be using `web_engine_shell` as the target browser and
 `gpu_process` as the test suite we wish to execute. Build the target

docs/fuchsia/telemetry.md

@@ -5,7 +5,7 @@
 General instruction on running and debugging benchmarks can be found in the
 [`tools/perf/README.md`](../../tools/perf/README.md).
 
-Fuchsia uses [web_engine_shell](../../fuchsia/engine/test/README.md) to run
+Fuchsia uses [web_engine_shell](../../fuchsia_web/webengine/test/README.md) to run
 integration tests. Be sure to build any components you wish to deploy on your
 device, along with `web_engine_shell`.
 

fuchsia/base/BUILD.gn

@@ -13,8 +13,9 @@ source_set("base") {
   visibility = [
     "./test/*",
     "//chromecast/internal/*",
-    "//fuchsia/engine/*",
     "//fuchsia_web/runners/*",
+    "//fuchsia_web/webengine/*",
+    "//fuchsia_web/webinstance_host/*",
   ]
   sources = [
     "fuchsia_dir_scheme.cc",
@@ -43,8 +44,8 @@ source_set("modular") {
     ":cr_fuchsia_base_unittests__exec",
     "./test/*",
     "//chromecast/internal/*",
-    "//fuchsia/engine/*",
     "//fuchsia_web/runners/*",
+    "//fuchsia_web/webengine/*",
   ]
   sources = [
     "agent_impl.cc",
@@ -63,7 +64,7 @@ source_set("modular") {
 
 # FIDL/Mojo adapters for MessagePorts.
 source_set("message_port") {
-  visibility = [ "//fuchsia/engine/*" ]
+  visibility = [ "//fuchsia_web/webengine/*" ]
   sources = [ "message_port.cc" ]
   public = [ "message_port.h" ]
   public_deps = [
@@ -83,8 +84,8 @@ source_set("message_port") {
 static_library("run_all_integration_tests") {
   testonly = true
   visibility = [
-    "//fuchsia/engine/*",
     "//fuchsia_web/runners/*",
+    "//fuchsia_web/webengine/*",
   ]
   sources = [ "run_all_integration_tests.cc" ]
   deps = [ "//base/test:test_support" ]

fuchsia_web/BUILD.gn

@@ -14,6 +14,6 @@ group("gn_all") {
   deps = [
     "runners:cast_runner",
     "runners:web_runner",
-    "//fuchsia/engine:web_engine",
+    "webengine:web_engine",
   ]
 }

fuchsia_web/runners/BUILD.gn

@@ -34,7 +34,7 @@ source_set("common") {
     "//base",
     "//fuchsia/base",
     "//fuchsia/base:modular",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//third_party/fuchsia-sdk/sdk/pkg/scenic_cpp",
     "//ui/gfx/geometry",
     "//url",
@@ -105,7 +105,7 @@ source_set("cast_runner_core") {
   ]
 
   # Keep CastRunner trim by ensuring that large browser dependencies don't creep in.
-  # TODO(crbug.com/1211328): Migrate //fuchsia/engine/web_instance_host to have
+  # TODO(crbug.com/1211328): Migrate //fuchsia_web/webengine/web_instance_host to have
   # each web_instance set the command-line options internally, so that no-deps
   # assertions on the "common" targets can be used again.
   assert_no_deps = [
@@ -126,7 +126,7 @@ executable("cast_runner_exe") {
     "//base",
     "//components/fuchsia_component_support",
     "//fuchsia/base",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//third_party/fuchsia-sdk/sdk/pkg/sys_inspect_cpp",
   ]
 
@@ -147,7 +147,7 @@ _web_instance_host_deps_files_to_exclude = [
 
   # TODO(crbug.com/1022542): SwiftShader is not used in cast_runner.
   # This list should match the list of SwiftShader files excluded from the
-  # web_engine package (see fuchsia/engine/BUILD.gn).
+  # web_engine package (see fuchsia_web/webengine/BUILD.gn).
   "lib/libvk_swiftshader.so",
   "vk_swiftshader_icd.json",
 ]
@@ -187,7 +187,7 @@ fuchsia_package_installer("cast_runner") {
   package = ":cast_runner_pkg"
   package_name = "cast_runner"
   package_deps = [ [
-        "//fuchsia/engine:web_engine",
+        "//fuchsia_web/webengine:web_engine",
         "web_engine",
       ] ]
 }
@@ -253,7 +253,7 @@ test("cast_runner_integration_tests") {
       "cast_runner",
     ],
     [
-      "//fuchsia/engine:web_engine",
+      "//fuchsia_web/webengine:web_engine",
       "web_engine",
     ],
   ]
@@ -282,7 +282,7 @@ test("cast_runner_browsertests") {
     "//content/test:test_support",
     "//fuchsia/base",
     "//fuchsia/base/test:test_support",
-    "//fuchsia/engine:browsertest_core",
+    "//fuchsia_web/webengine:browsertest_core",
     "//testing/gmock",
     "//testing/gtest",
     "//ui/ozone",
@@ -303,7 +303,7 @@ executable("web_runner_exe") {
     "//base",
     "//components/fuchsia_component_support",
     "//fuchsia/base",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//third_party/fuchsia-sdk/sdk/pkg/sys_inspect_cpp",
   ]
   visibility = [ ":*" ]
@@ -325,7 +325,7 @@ fuchsia_package_installer("web_runner") {
   package = ":web_runner_pkg"
   package_name = "web_runner"
   package_deps = [ [
-        "//fuchsia/engine:web_engine",
+        "//fuchsia_web/webengine:web_engine",
         "web_engine",
       ] ]
 }
@@ -344,7 +344,7 @@ test("web_runner_integration_tests") {
   ]
   package_deps = [
     [
-      "//fuchsia/engine:web_engine",
+      "//fuchsia_web/webengine:web_engine",
       "web_engine",
     ],
     [

fuchsia_web/runners/DEPS

@@ -1,5 +1,5 @@
 include_rules  =  [
   "+components/fuchsia_component_support",
   "+fuchsia/base",
-  "+fuchsia/engine/web_instance_host",
+  "+fuchsia_web/webinstance_host",
 ]

fuchsia_web/runners/cast/DEPS

@@ -12,8 +12,8 @@ include_rules = [
 specific_include_rules = {
   ".*_browsertest\.cc": [
     # WebEngine test helpers.
-    "+fuchsia/engine/test/frame_for_test.h",
+    "+fuchsia_web/webengine/test/frame_for_test.h",
-    "+fuchsia/engine/test/web_engine_browser_test.h",
+    "+fuchsia_web/webengine/test/web_engine_browser_test.h",
   ],
   ".*_integration_test\.cc": [
     # Audio test helpers.

fuchsia_web/runners/cast/api_bindings_client_browsertest.cc

@@ -16,12 +16,12 @@
 #include "fuchsia/base/test/fit_adapter.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/test/frame_for_test.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
 #include "fuchsia_web/runners/cast/api_bindings_client.h"
 #include "fuchsia_web/runners/cast/create_web_message.h"
 #include "fuchsia_web/runners/cast/fake_api_bindings.h"
 #include "fuchsia_web/runners/cast/named_message_port_connector_fuchsia.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/runners/cast/main.cc

@@ -25,9 +25,9 @@
 #include "components/fuchsia_component_support/inspect.h"
 #include "fuchsia/base/fuchsia_dir_scheme.h"
 #include "fuchsia/base/init_logging.h"
-#include "fuchsia/engine/web_instance_host/web_instance_host.h"
 #include "fuchsia_web/runners/cast/cast_runner.h"
 #include "fuchsia_web/runners/cast/cast_runner_switches.h"
+#include "fuchsia_web/webinstance_host/web_instance_host.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace {

fuchsia_web/runners/cast/named_message_port_connector_fuchsia_browsertest.cc

@@ -13,10 +13,10 @@
 #include "fuchsia/base/test/fit_adapter.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/test/frame_for_test.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
 #include "fuchsia_web/runners/cast/create_web_message.h"
 #include "fuchsia_web/runners/cast/named_message_port_connector_fuchsia.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

fuchsia_web/runners/common/web_content_runner.cc

@@ -22,9 +22,9 @@
 #include "base/fuchsia/startup_context.h"
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
-#include "fuchsia/engine/web_instance_host/web_instance_host.h"
 #include "fuchsia_web/runners/buildflags.h"
 #include "fuchsia_web/runners/common/web_component.h"
+#include "fuchsia_web/webinstance_host/web_instance_host.h"
 #include "url/gurl.h"
 
 namespace {

fuchsia_web/runners/web/main.cc

@@ -16,9 +16,9 @@
 #include "components/fuchsia_component_support/inspect.h"
 #include "fuchsia/base/fuchsia_dir_scheme.h"
 #include "fuchsia/base/init_logging.h"
-#include "fuchsia/engine/web_instance_host/web_instance_host.h"
 #include "fuchsia_web/runners/buildflags.h"
 #include "fuchsia_web/runners/common/web_content_runner.h"
+#include "fuchsia_web/webinstance_host/web_instance_host.h"
 
 namespace {
 

fuchsia_web/webengine/BUILD.gn

@@ -122,8 +122,8 @@ component("web_engine_core") {
     "//fuchsia/base",
     "//fuchsia/base:message_port",
     "//fuchsia/base:modular",
-    "//fuchsia/engine/mojom",
+    "//fuchsia_web/webengine/mojom",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//google_apis",
     "//gpu/command_buffer/service",
     "//media",
@@ -312,7 +312,7 @@ source_set("switches") {
 
   visibility = [
     ":*",
-    "web_instance_host",
+    "//fuchsia_web/webinstance_host",
   ]
 }
 
@@ -577,7 +577,7 @@ test("web_engine_unittests") {
     "//components/url_rewrite/mojom",
     "//content/test:test_support",
     "//fuchsia/base/test:test_support",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//mojo/core/embedder",
     "//services/media_session/public/mojom",
     "//services/network:network_service",
@@ -613,6 +613,8 @@ test("web_engine_integration_tests") {
     "web_engine_integration_test.cc",
     "web_engine_integration_test_base.cc",
     "web_engine_integration_test_base.h",
+
+    # TODO(crbug.com/1081525): Move to //fuchsia_web/webinstance_host/.
     "web_instance_host_integration_test.cc",
   ]
   data = [ "test/data" ]
@@ -624,7 +626,7 @@ test("web_engine_integration_tests") {
     "//fuchsia/base",
     "//fuchsia/base:run_all_integration_tests",
     "//fuchsia/base/test:test_support",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//media",
     "//media/fuchsia/audio:test_support",
     "//media/fuchsia/camera:test_support",
@@ -686,7 +688,7 @@ executable("web_engine_shell_exec") {
   deps = [
     "//base",
     "//fuchsia/base",
-    "//fuchsia/engine/web_instance_host",
+    "//fuchsia_web/webinstance_host",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.ui.policy",
     "//third_party/fuchsia-sdk/sdk/fidl/fuchsia.web",
     "//third_party/fuchsia-sdk/sdk/pkg/fdio",

fuchsia_web/webengine/DEPS

@@ -1,6 +1,5 @@
 include_rules = [
   # Do NOT add components/cast or other Cast-specific code to this file.
-  "+cc/base/switches.h",
   "+components/cast/message_port",
   "+components/cast_streaming",
   "+components/embedder_support",
@@ -8,24 +7,19 @@ include_rules = [
   "+components/media_control",
   "+components/on_load_script_injector",
   "+components/version_info",
-  "+components/viz/common",
   "+content/public/app",
   "+content/public/common",
   "+fuchsia/base",
+  "+fuchsia_web/webinstance_host",
   "+google_apis",
-  "+gpu/command_buffer/service",
+  "+gpu/command_buffer/service/gpu_switches.h",
-  "+gpu/config/gpu_finch_features.h",
+  "+media/base/media_switches.h",
-  "+gpu/config/gpu_switches.h",
-  "+media/base",
   "+media/fuchsia",
   "+mojo/public",
   "+net",
   "+third_party/widevine/cdm/widevine_cdm_common.h",
   "+ui/base",
-  "+ui/display/display_switches.h",
+  "+ui/gfx/switches.h",
-  "+ui/gfx",
-  "+ui/gl/gl_switches.h",
-  "+ui/ozone/public",
 ]
 
 specific_include_rules = {

fuchsia_web/webengine/browser/DEPS

@@ -6,6 +6,7 @@ include_rules = [
   "+components/keyed_service/content",
   "+components/keyed_service/core",
   "+components/on_load_script_injector/browser",
+  "+components/permissions",
   "+components/profile_metrics",
   "+components/policy/content",
   "+components/site_isolation",
@@ -15,7 +16,6 @@ include_rules = [
   "+components/url_rewrite/mojom",
   "+content/public/common",
   "+content/public/browser",
-  "+components/permissions",
   "+media/base",
   "+media/capabilities",
   "+media/fuchsia/cdm/service",

fuchsia_web/webengine/browser/accessibility_bridge.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 "fuchsia/engine/browser/accessibility_bridge.h"
+#include "fuchsia_web/webengine/browser/accessibility_bridge.h"
 
 #include <lib/sys/cpp/component_context.h>
 #include <lib/sys/inspect/cpp/component.h>
@@ -16,7 +16,7 @@
 #include "base/logging.h"
 #include "content/public/browser/global_routing_id.h"
 #include "content/public/browser/render_widget_host_view.h"
-#include "fuchsia/engine/browser/frame_window_tree_host.h"
+#include "fuchsia_web/webengine/browser/frame_window_tree_host.h"
 #include "ui/accessibility/ax_action_data.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 

fuchsia_web/webengine/browser/accessibility_bridge.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 FUCHSIA_ENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_
-#define FUCHSIA_ENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 #include <fuchsia/math/cpp/fidl.h>
@@ -18,8 +18,8 @@
 #include "content/public/browser/ax_event_notification_details.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "fuchsia/engine/browser/ax_tree_converter.h"
+#include "fuchsia_web/webengine/browser/ax_tree_converter.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/accessibility/ax_serializable_tree.h"
 #include "ui/accessibility/ax_tree_id.h"
@@ -266,4 +266,4 @@ class WEB_ENGINE_EXPORT AccessibilityBridge final
   inspect::LazyNode inspect_node_tree_dump_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_ACCESSIBILITY_BRIDGE_H_

fuchsia_web/webengine/browser/accessibility_bridge_browsertest.cc

@@ -13,13 +13,13 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/accessibility_bridge.h"
+#include "fuchsia_web/webengine/browser/accessibility_bridge.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/fake_semantics_manager.h"
+#include "fuchsia_web/webengine/browser/fake_semantics_manager.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_action_data.h"

fuchsia_web/webengine/browser/accessibility_browsertest.cc

@@ -15,13 +15,13 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/accessibility_bridge.h"
+#include "fuchsia_web/webengine/browser/accessibility_bridge.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/fake_semantics_manager.h"
+#include "fuchsia_web/webengine/browser/fake_semantics_manager.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_action_data.h"

fuchsia_web/webengine/browser/autoplay_browsertest.cc

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 
 #include "base/files/file_path.h"
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/blink/public/mojom/frame/user_activation_notification_type.mojom.h"
 

fuchsia_web/webengine/browser/ax_tree_converter.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 "fuchsia/engine/browser/ax_tree_converter.h"
+#include "fuchsia_web/webengine/browser/ax_tree_converter.h"
 
 #include <fuchsia/math/cpp/fidl.h>
 #include <fuchsia/ui/gfx/cpp/fidl.h>

fuchsia_web/webengine/browser/ax_tree_converter.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 FUCHSIA_ENGINE_BROWSER_AX_TREE_CONVERTER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_AX_TREE_CONVERTER_H_
-#define FUCHSIA_ENGINE_BROWSER_AX_TREE_CONVERTER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_AX_TREE_CONVERTER_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 
@@ -11,7 +11,7 @@
 
 #include "base/containers/flat_map.h"
 #include "content/public/browser/ax_event_notification_details.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "ui/accessibility/ax_node.h"
 
@@ -78,4 +78,4 @@ AXNodeDataToSemanticNode(const ui::AXNode& ax_node,
 bool ConvertAction(fuchsia::accessibility::semantics::Action fuchsia_action,
                    ax::mojom::Action* mojom_action);
 
-#endif  // FUCHSIA_ENGINE_BROWSER_AX_TREE_CONVERTER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_AX_TREE_CONVERTER_H_

fuchsia_web/webengine/browser/ax_tree_converter_unittest.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 "fuchsia/engine/browser/ax_tree_converter.h"
+#include "fuchsia_web/webengine/browser/ax_tree_converter.h"
 
 #include <lib/ui/scenic/cpp/commands.h>
 #include <vector>

fuchsia_web/webengine/browser/cast_streaming_browsertest.cc

@@ -15,11 +15,11 @@
 #include "fuchsia/base/test/fit_adapter.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "media/base/media_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

fuchsia_web/webengine/browser/client_hints_browsertest.cc

@@ -12,10 +12,10 @@
 #include "content/public/test/browser_test_utils.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 #include "services/network/public/mojom/web_client_hints_types.mojom-shared.h"
 
 namespace {

fuchsia_web/webengine/browser/content_directory_browsertest.cc

@@ -8,7 +8,7 @@
 #include <lib/vfs/cpp/vmo_file.h>
 
 #include "base/strings/string_piece.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ -21,9 +21,9 @@
 #include "content/public/test/content_test_suite_base.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/content_directory_loader_factory.h"
+#include "fuchsia_web/webengine/browser/content_directory_loader_factory.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_util.h"
 
@@ -112,11 +112,11 @@ class ContentDirectoryTest : public cr_fuchsia::WebEngineBrowserTest {
         base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &pkg_path));
 
     testdata_content_directory_ = std::make_unique<ScopedBindContentDirectory>(
-        "testdata", base::OpenDirectoryHandle(
+        "testdata", base::OpenDirectoryHandle(pkg_path.AppendASCII(
-                        pkg_path.AppendASCII("fuchsia/engine/test/data")));
+                        "fuchsia_web/webengine/test/data")));
     alternate_content_directory_ = std::make_unique<ScopedBindContentDirectory>(
-        "alternate", base::OpenDirectoryHandle(
+        "alternate", base::OpenDirectoryHandle(pkg_path.AppendASCII(
-                         pkg_path.AppendASCII("fuchsia/engine/test/data")));
+                         "fuchsia_web/webengine/test/data")));
 
     cr_fuchsia::WebEngineBrowserTest::SetUpOnMainThread();
   }
@@ -186,7 +186,8 @@ IN_PROC_BROWSER_TEST_F(ContentDirectoryTest, FromVfsPseudoDir) {
   base::FilePath pkg_path;
   base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &pkg_path);
   ASSERT_TRUE(base::ReadFileToString(
-      pkg_path.AppendASCII("fuchsia/engine/test/data/title1.html"), &contents));
+      pkg_path.AppendASCII("fuchsia_web/webengine/test/data/title1.html"),
+      &contents));
 
   vfs::PseudoDir pseudo_dir;
   AddFileToPseudoDir(contents, base::FilePath("title1.html"), &pseudo_dir);
@@ -265,7 +266,8 @@ IN_PROC_BROWSER_TEST_F(ContentDirectoryTest, BigFilesAreSniffable) {
   base::FilePath pkg_path;
   base::PathService::Get(base::DIR_SRC_TEST_DATA_ROOT, &pkg_path);
   ASSERT_TRUE(base::ReadFileToString(
-      pkg_path.AppendASCII("fuchsia/engine/test/data/mime_override.html"),
+      pkg_path.AppendASCII(
+          "fuchsia_web/webengine/test/data/mime_override.html"),
       &contents));
 
   vfs::PseudoDir pseudo_dir;

fuchsia_web/webengine/browser/content_directory_loader_factory.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 "fuchsia/engine/browser/content_directory_loader_factory.h"
+#include "fuchsia_web/webengine/browser/content_directory_loader_factory.h"
 
 #include <lib/fdio/directory.h>
 #include <lib/fdio/fdio.h>
@@ -24,8 +24,8 @@
 #include "base/task/task_traits.h"
 #include "base/task/thread_pool.h"
 #include "fuchsia/base/fuchsia_dir_scheme.h"
-#include "fuchsia/engine/common/web_engine_content_client.h"
+#include "fuchsia_web/webengine/common/web_engine_content_client.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "mojo/public/cpp/system/data_pipe_producer.h"

fuchsia_web/webengine/browser/content_directory_loader_factory.h

@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_
-#define FUCHSIA_ENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_
 
 #include <fuchsia/io/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/fidl/cpp/interface_handle.h>
 
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "mojo/public/cpp/bindings/receiver_set.h"
@@ -54,4 +54,4 @@ class ContentDirectoryLoaderFactory
   const scoped_refptr<base::SequencedTaskRunner> task_runner_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_CONTENT_DIRECTORY_LOADER_FACTORY_H_

fuchsia_web/webengine/browser/context_impl.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 "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
 
 #include <lib/fpromise/result.h>
 #include <lib/zx/channel.h>
@@ -20,8 +20,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/web_engine_devtools_controller.h"
+#include "fuchsia_web/webengine/browser/web_engine_devtools_controller.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "third_party/blink/public/mojom/webpreferences/web_preferences.mojom.h"
 

fuchsia_web/webengine/browser/context_impl.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 FUCHSIA_ENGINE_BROWSER_CONTEXT_IMPL_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_CONTEXT_IMPL_H_
-#define FUCHSIA_ENGINE_BROWSER_CONTEXT_IMPL_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_CONTEXT_IMPL_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
@@ -12,8 +12,8 @@
 #include <set>
 
 #include "base/containers/unique_ptr_adapters.h"
-#include "fuchsia/engine/browser/cookie_manager_impl.h"
+#include "fuchsia_web/webengine/browser/cookie_manager_impl.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 
 namespace content {
 class BrowserContext;
@@ -116,4 +116,4 @@ class WEB_ENGINE_EXPORT ContextImpl final : public fuchsia::web::Context {
   std::set<std::unique_ptr<FrameImpl>, base::UniquePtrComparator> frames_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_CONTEXT_IMPL_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_CONTEXT_IMPL_H_

fuchsia_web/webengine/browser/context_impl_browsertest.cc

@@ -7,9 +7,9 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/url_constants.h"
 

fuchsia_web/webengine/browser/cookie_manager_impl.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 "fuchsia/engine/browser/cookie_manager_impl.h"
+#include "fuchsia_web/webengine/browser/cookie_manager_impl.h"
 
 #include <lib/fidl/cpp/binding.h>
 

fuchsia_web/webengine/browser/cookie_manager_impl.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_
-#define FUCHSIA_ENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
 #include "base/callback.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "services/network/public/mojom/cookie_manager.mojom.h"
 
@@ -64,4 +64,4 @@ class WEB_ENGINE_EXPORT CookieManagerImpl final
   base::OnceClosure on_mojo_disconnected_for_test_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_COOKIE_MANAGER_IMPL_H_

fuchsia_web/webengine/browser/cookie_manager_impl_unittest.cc

@@ -14,7 +14,7 @@
 #include "base/test/task_environment.h"
 #include "base/test/test_future.h"
 #include "fuchsia/base/test/fit_adapter.h"
-#include "fuchsia/engine/browser/cookie_manager_impl.h"
+#include "fuchsia_web/webengine/browser/cookie_manager_impl.h"
 #include "mojo/public/cpp/bindings/remote.h"
 #include "net/cookies/cookie_access_result.h"
 #include "services/network/network_service.h"
@@ -51,8 +51,7 @@ std::unique_ptr<net::CanonicalCookie> CreateCookie(base::StringPiece name,
 class CookieManagerImplTest : public testing::Test {
  public:
   CookieManagerImplTest()
-      : task_environment_(
+      : task_environment_(base::test::TaskEnvironment::MainThreadType::IO),
-            base::test::TaskEnvironment::MainThreadType::IO),
         network_service_(network::NetworkService::CreateForTesting()),
         cookie_manager_(
             base::BindRepeating(&CookieManagerImplTest::GetNetworkContext,

fuchsia_web/webengine/browser/event_filter.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 "fuchsia/engine/browser/event_filter.h"
+#include "fuchsia_web/webengine/browser/event_filter.h"
 
 #include <limits>
 

fuchsia_web/webengine/browser/event_filter.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_EVENT_FILTER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_EVENT_FILTER_H_
-#define FUCHSIA_ENGINE_BROWSER_EVENT_FILTER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_EVENT_FILTER_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "ui/events/event_handler.h"
 #include "ui/events/types/event_type.h"
 
@@ -43,4 +43,4 @@ class WEB_ENGINE_EXPORT EventFilter : public ui::EventHandler {
   bool enable_unknown_types_ = true;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_EVENT_FILTER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_EVENT_FILTER_H_

fuchsia_web/webengine/browser/event_filter_unittest.cc

@@ -4,7 +4,7 @@
 
 #include <fuchsia/web/cpp/fidl.h>
 
-#include "fuchsia/engine/browser/event_filter.h"
+#include "fuchsia_web/webengine/browser/event_filter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 

fuchsia_web/webengine/browser/explicit_sites_filter_browsertest.cc

@@ -14,11 +14,11 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/browser/web_engine_browser_main_parts.h"
+#include "fuchsia_web/webengine/browser/web_engine_browser_main_parts.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/webengine/browser/fake_navigation_policy_provider.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 "fuchsia/engine/browser/fake_navigation_policy_provider.h"
+#include "fuchsia_web/webengine/browser/fake_navigation_policy_provider.h"
 
 #include "base/notreached.h"
 #include "testing/gtest/include/gtest/gtest.h"

fuchsia_web/webengine/browser/fake_navigation_policy_provider.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 FUCHSIA_ENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_
-#define FUCHSIA_ENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl_test_base.h>
@@ -40,4 +40,4 @@ class FakeNavigationPolicyProvider
   int num_evaluated_navigations_ = 0;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_NAVIGATION_POLICY_PROVIDER_H_

fuchsia_web/webengine/browser/fake_semantic_tree.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 "fuchsia/engine/browser/fake_semantic_tree.h"
+#include "fuchsia_web/webengine/browser/fake_semantic_tree.h"
 
 #include <lib/fidl/cpp/binding.h>
 #include <zircon/types.h>

fuchsia_web/webengine/browser/fake_semantic_tree.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 FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_
-#define FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 #include <fuchsia/accessibility/semantics/cpp/fidl_test_base.h>
@@ -80,4 +80,4 @@ class FakeSemanticTree
   size_t num_commit_calls_ = 0;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTIC_TREE_H_

fuchsia_web/webengine/browser/fake_semantics_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 "fuchsia/engine/browser/fake_semantics_manager.h"
+#include "fuchsia_web/webengine/browser/fake_semantics_manager.h"
 
 #include "base/check.h"
 #include "base/notreached.h"

fuchsia_web/webengine/browser/fake_semantics_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 FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_
-#define FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_
 
 #include <fuchsia/accessibility/semantics/cpp/fidl.h>
 #include <fuchsia/accessibility/semantics/cpp/fidl_test_base.h>
@@ -11,7 +11,7 @@
 #include <lib/fidl/cpp/binding.h>
 
 #include "base/callback.h"
-#include "fuchsia/engine/browser/fake_semantic_tree.h"
+#include "fuchsia_web/webengine/browser/fake_semantic_tree.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 
 class FakeSemanticsManager : public fuchsia::accessibility::semantics::testing::
@@ -84,4 +84,4 @@ class FakeSemanticsManager : public fuchsia::accessibility::semantics::testing::
   base::OnceClosure on_view_registered_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FAKE_SEMANTICS_MANAGER_H_

fuchsia_web/webengine/browser/favicon_browsertest.cc

@@ -6,9 +6,9 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/webengine/browser/frame_host_impl_browsertest.cc

@@ -6,8 +6,8 @@
 
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/webengine/browser/frame_impl.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 "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
 
 #include <fuchsia/ui/gfx/cpp/fidl.h>
 #include <lib/fpromise/result.h>
@@ -41,17 +41,17 @@
 #include "content/public/browser/renderer_preferences_util.h"
 #include "content/public/browser/web_contents.h"
 #include "fuchsia/base/message_port.h"
-#include "fuchsia/engine/browser/accessibility_bridge.h"
+#include "fuchsia_web/webengine/browser/accessibility_bridge.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/event_filter.h"
+#include "fuchsia_web/webengine/browser/event_filter.h"
-#include "fuchsia/engine/browser/frame_layout_manager.h"
+#include "fuchsia_web/webengine/browser/frame_layout_manager.h"
-#include "fuchsia/engine/browser/frame_window_tree_host.h"
+#include "fuchsia_web/webengine/browser/frame_window_tree_host.h"
-#include "fuchsia/engine/browser/media_player_impl.h"
+#include "fuchsia_web/webengine/browser/media_player_impl.h"
-#include "fuchsia/engine/browser/navigation_policy_handler.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_handler.h"
-#include "fuchsia/engine/browser/receiver_session_client.h"
+#include "fuchsia_web/webengine/browser/receiver_session_client.h"
-#include "fuchsia/engine/browser/url_request_rewrite_type_converters.h"
+#include "fuchsia_web/webengine/browser/url_request_rewrite_type_converters.h"
-#include "fuchsia/engine/browser/web_engine_devtools_controller.h"
+#include "fuchsia_web/webengine/browser/web_engine_devtools_controller.h"
-#include "fuchsia/engine/common/cast_streaming.h"
+#include "fuchsia_web/webengine/common/cast_streaming.h"
 #include "mojo/public/cpp/bindings/associated_remote.h"
 #include "mojo/public/cpp/system/platform_handle.h"
 #include "net/base/net_errors.h"

fuchsia_web/webengine/browser/frame_impl.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 FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_H_
-#define FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_H_
 
 #include <fuchsia/logger/cpp/fidl.h>
 #include <fuchsia/mem/cpp/fidl.h>
@@ -29,12 +29,12 @@
 #include "components/url_rewrite/browser/url_request_rewrite_rules_manager.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "fuchsia/engine/browser/accessibility_bridge.h"
+#include "fuchsia_web/webengine/browser/accessibility_bridge.h"
-#include "fuchsia/engine/browser/event_filter.h"
+#include "fuchsia_web/webengine/browser/event_filter.h"
-#include "fuchsia/engine/browser/frame_permission_controller.h"
+#include "fuchsia_web/webengine/browser/frame_permission_controller.h"
-#include "fuchsia/engine/browser/navigation_controller_impl.h"
+#include "fuchsia_web/webengine/browser/navigation_controller_impl.h"
-#include "fuchsia/engine/browser/theme_manager.h"
+#include "fuchsia_web/webengine/browser/theme_manager.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 #include "ui/accessibility/platform/fuchsia/accessibility_bridge_fuchsia_impl.h"
@@ -424,4 +424,4 @@ class WEB_ENGINE_EXPORT FrameImpl : public fuchsia::web::Frame,
   base::WeakPtrFactory<FrameImpl> weak_factory_{this};
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_H_

fuchsia_web/webengine/browser/frame_impl_browser_test_base.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
 
 #include "base/files/file_path.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
 
 // TODO(crbug.com/1155378): Remove this and use default after updating tests in
 // frame_impl_browser_test_base.cc to use the appropriate base.

fuchsia_web/webengine/browser/frame_impl_browser_test_base.h

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_
-#define FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_
 
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
 // Base test class used for testing FrameImpl and the WebEngine Frame FIDL
@@ -37,4 +37,4 @@ class FrameImplTestBaseWithServer : public FrameImplTestBase {
   net::test_server::EmbeddedTestServerHandle test_server_handle_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_IMPL_BROWSER_TEST_BASE_H_

fuchsia_web/webengine/browser/frame_impl_browsertest.cc

@@ -15,11 +15,11 @@
 #include "fuchsia/base/test/fit_adapter.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/fake_semantics_manager.h"
+#include "fuchsia_web/webengine/browser/fake_semantics_manager.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 #include "net/test/embedded_test_server/request_handler_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 

fuchsia_web/webengine/browser/frame_layout_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 "fuchsia/engine/browser/frame_layout_manager.h"
+#include "fuchsia_web/webengine/browser/frame_layout_manager.h"
 
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/compositor.h"

fuchsia_web/webengine/browser/frame_layout_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 FUCHSIA_ENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_
-#define FUCHSIA_ENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_
 
 #include "ui/aura/layout_manager.h"
 #include "ui/aura/window.h"
@@ -49,4 +49,4 @@ class FrameLayoutManager : public aura::LayoutManager {
   gfx::Size render_size_override_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_LAYOUT_MANAGER_H_

fuchsia_web/webengine/browser/frame_permission_controller.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 "fuchsia/engine/browser/frame_permission_controller.h"
+#include "fuchsia_web/webengine/browser/frame_permission_controller.h"
 
 #include "base/check_op.h"
 #include "components/permissions/permission_util.h"

fuchsia_web/webengine/browser/frame_permission_controller.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 FUCHSIA_ENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_
-#define FUCHSIA_ENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_
 
 #include <array>
 #include <vector>
@@ -91,4 +91,4 @@ class FramePermissionController {
   PermissionSet default_permissions_{blink::mojom::PermissionStatus::DENIED};
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_PERMISSION_CONTROLLER_H_

fuchsia_web/webengine/browser/frame_window_tree_host.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/browser/frame_window_tree_host.h"
+#include "fuchsia_web/webengine/browser/frame_window_tree_host.h"
 
 #include "base/fuchsia/fuchsia_logging.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
-#include "fuchsia/engine/features.h"
+#include "fuchsia_web/webengine/features.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/client/window_parenting_client.h"
 #include "ui/base/ime/input_method.h"

fuchsia_web/webengine/browser/frame_window_tree_host.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 FUCHSIA_ENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_
-#define FUCHSIA_ENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_
 
 #include <lib/ui/scenic/cpp/view_ref_pair.h>
 
@@ -58,4 +58,4 @@ class FrameWindowTreeHost final : public aura::WindowTreeHostPlatform,
   OnPixelScaleUpdateCallback on_pixel_scale_update_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_FRAME_WINDOW_TREE_HOST_H_

fuchsia_web/webengine/browser/headless_browsertest.cc

@@ -7,10 +7,10 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/switches.h"
 #include "ui/ozone/public/ozone_switches.h"

fuchsia_web/webengine/browser/input_browsertest.cc

@@ -14,12 +14,12 @@
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/scoped_connection_checker.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/features.h"
+#include "fuchsia_web/webengine/features.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/scenic_test_helper.h"
+#include "fuchsia_web/webengine/test/scenic_test_helper.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using fuchsia::input::Key;

fuchsia_web/webengine/browser/javascript_browsertest.cc

@@ -6,8 +6,8 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 
 namespace {
 

fuchsia_web/webengine/browser/media_browsertest.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 "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 
 #include <fuchsia/mediacodec/cpp/fidl_test_base.h>
 
@@ -13,9 +13,9 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/features.h"
+#include "fuchsia_web/webengine/features.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

fuchsia_web/webengine/browser/media_player_impl.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 "fuchsia/engine/browser/media_player_impl.h"
+#include "fuchsia_web/webengine/browser/media_player_impl.h"
 
 #include <fuchsia/media/cpp/fidl.h>
 

fuchsia_web/webengine/browser/media_player_impl.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 FUCHSIA_ENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_
-#define FUCHSIA_ENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_
 
 #include <fuchsia/media/sessions2/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
@@ -11,7 +11,7 @@
 #include <string>
 
 #include "base/callback.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "mojo/public/cpp/bindings/receiver.h"
 #include "services/media_session/public/mojom/media_session.mojom.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
@@ -95,4 +95,4 @@ class WEB_ENGINE_EXPORT MediaPlayerImpl final
   fuchsia::media::sessions2::PlayerInfoDelta pending_info_delta_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_MEDIA_PLAYER_IMPL_H_

fuchsia_web/webengine/browser/media_player_impl_unittest.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 "fuchsia/engine/browser/media_player_impl.h"
+#include "fuchsia_web/webengine/browser/media_player_impl.h"
 
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"

fuchsia_web/webengine/browser/mock_virtual_keyboard.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 "fuchsia/engine/browser/mock_virtual_keyboard.h"
+#include "fuchsia_web/webengine/browser/mock_virtual_keyboard.h"
 
 #include "base/run_loop.h"
 

fuchsia_web/webengine/browser/mock_virtual_keyboard.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 FUCHSIA_ENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_
-#define FUCHSIA_ENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_
 
 #include <fuchsia/input/virtualkeyboard/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
@@ -89,4 +89,4 @@ class MockVirtualKeyboardControllerCreator
       binding_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_MOCK_VIRTUAL_KEYBOARD_H_

fuchsia_web/webengine/browser/navigation_controller_impl.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 "fuchsia/engine/browser/navigation_controller_impl.h"
+#include "fuchsia_web/webengine/browser/navigation_controller_impl.h"
 
 #include <fuchsia/mem/cpp/fidl.h>
 #include <lib/fpromise/result.h>

fuchsia_web/webengine/browser/navigation_controller_impl.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 FUCHSIA_ENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_
-#define FUCHSIA_ENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/fidl/cpp/binding_set.h>
@@ -11,7 +11,7 @@
 #include "base/memory/weak_ptr.h"
 #include "components/favicon/core/favicon_driver_observer.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 
 namespace content {
 class NavigationEntry;
@@ -115,4 +115,4 @@ WEB_ENGINE_EXPORT void DiffNavigationEntriesForTest(
     const fuchsia::web::NavigationState& new_entry,
     fuchsia::web::NavigationState* difference);
 
-#endif  // FUCHSIA_ENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_CONTROLLER_IMPL_H_

fuchsia_web/webengine/browser/navigation_controller_impl_unittest.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 "fuchsia/engine/browser/navigation_controller_impl.h"
+#include "fuchsia_web/webengine/browser/navigation_controller_impl.h"
 
 #include "base/strings/string_piece.h"
 #include "base/test/gtest_util.h"

fuchsia_web/webengine/browser/navigation_policy_browsertest.cc

@@ -7,13 +7,13 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/fake_navigation_policy_provider.h"
+#include "fuchsia_web/webengine/browser/fake_navigation_policy_provider.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/navigation_policy_handler.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_handler.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

fuchsia_web/webengine/browser/navigation_policy_handler.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/browser/navigation_policy_handler.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_handler.h"
 
 #include <lib/fidl/cpp/binding.h>
 
 #include "base/fuchsia/fuchsia_logging.h"
 #include "content/public/browser/navigation_handle.h"
-#include "fuchsia/engine/browser/navigation_policy_throttle.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_throttle.h"
 
 NavigationPolicyHandler::NavigationPolicyHandler(
     fuchsia::web::NavigationPolicyProviderParams params,

fuchsia_web/webengine/browser/navigation_policy_handler.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_
-#define FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
 #include "base/containers/flat_set.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 
 class NavigationPolicyThrottle;
 
@@ -54,4 +54,4 @@ class WEB_ENGINE_EXPORT NavigationPolicyHandler {
   base::flat_set<NavigationPolicyThrottle*> navigation_throttles_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_HANDLER_H_

fuchsia_web/webengine/browser/navigation_policy_throttle.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/browser/navigation_policy_throttle.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_throttle.h"
 
 #include "content/public/browser/navigation_handle.h"
-#include "fuchsia/engine/browser/navigation_policy_handler.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_handler.h"
 
 namespace {
 

fuchsia_web/webengine/browser/navigation_policy_throttle.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_
-#define FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
 #include "content/public/browser/navigation_throttle.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 
 class NavigationPolicyHandler;
 
@@ -49,4 +49,4 @@ class WEB_ENGINE_EXPORT NavigationPolicyThrottle
   base::WeakPtrFactory<NavigationPolicyThrottle> weak_factory_{this};
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_NAVIGATION_POLICY_THROTTLE_H_

fuchsia_web/webengine/browser/navigation_policy_throttle_unittest.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "fuchsia/engine/browser/navigation_policy_throttle.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_throttle.h"
 
 #include <fuchsia/web/cpp/fidl.h>
 #include <lib/fidl/cpp/binding.h>
 
 #include "base/test/task_environment.h"
 #include "content/public/test/mock_navigation_handle.h"
-#include "fuchsia/engine/browser/fake_navigation_policy_provider.h"
+#include "fuchsia_web/webengine/browser/fake_navigation_policy_provider.h"
-#include "fuchsia/engine/browser/navigation_policy_handler.h"
+#include "fuchsia_web/webengine/browser/navigation_policy_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/webengine/browser/permissions_browsertest.cc

@@ -9,9 +9,9 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
 #include "testing/gtest/include/gtest/gtest.h"

fuchsia_web/webengine/browser/popup_browsertest.cc

@@ -5,8 +5,8 @@
 #include "content/public/test/browser_test.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 
 namespace {
 

fuchsia_web/webengine/browser/post_message_browsertest.cc

@@ -8,8 +8,8 @@
 #include "fuchsia/base/test/fit_adapter.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 
 namespace {
 

fuchsia_web/webengine/browser/receiver_session_client.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 "fuchsia/engine/browser/receiver_session_client.h"
+#include "fuchsia_web/webengine/browser/receiver_session_client.h"
 
 #include "base/bind.h"
 #include "components/cast/message_port/fuchsia/message_port_fuchsia.h"

fuchsia_web/webengine/browser/receiver_session_client.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 FUCHSIA_ENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_
-#define FUCHSIA_ENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
@@ -39,4 +39,4 @@ class ReceiverSessionClient {
   const bool video_only_receiver_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_RECEIVER_SESSION_CLIENT_H_

fuchsia_web/webengine/browser/request_monitoring_browsertest.cc

@@ -7,9 +7,9 @@
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
 #include "fuchsia/base/test/url_request_rewrite_test_util.h"
-#include "fuchsia/engine/browser/frame_impl_browser_test_base.h"
+#include "fuchsia_web/webengine/browser/frame_impl_browser_test_base.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace {

fuchsia_web/webengine/browser/theme_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 "fuchsia/engine/browser/theme_manager.h"
+#include "fuchsia_web/webengine/browser/theme_manager.h"
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"

fuchsia_web/webengine/browser/theme_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 FUCHSIA_ENGINE_BROWSER_THEME_MANAGER_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_THEME_MANAGER_H_
-#define FUCHSIA_ENGINE_BROWSER_THEME_MANAGER_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_THEME_MANAGER_H_
 
 #include <fuchsia/settings/cpp/fidl.h>
 #include <fuchsia/web/cpp/fidl.h>
@@ -11,7 +11,7 @@
 
 #include "base/fuchsia/process_context.h"
 #include "content/public/browser/web_contents.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 #include "third_party/blink/public/common/web_preferences/web_preferences.h"
 
@@ -55,4 +55,4 @@ class WEB_ENGINE_EXPORT ThemeManager {
   base::OnceClosure on_display_error_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_THEME_MANAGER_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_THEME_MANAGER_H_

fuchsia_web/webengine/browser/theme_manager_browsertest.cc

@@ -13,11 +13,11 @@
 #include "content/public/test/browser_test_utils.h"
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/abseil-cpp/absl/types/optional.h"
 

fuchsia_web/webengine/browser/url_request_invalidation_browsertest.cc

@@ -8,8 +8,8 @@
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
 #include "fuchsia/base/test/url_request_rewrite_test_util.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {

fuchsia_web/webengine/browser/url_request_rewrite_type_converters.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 "fuchsia/engine/browser/url_request_rewrite_type_converters.h"
+#include "fuchsia_web/webengine/browser/url_request_rewrite_type_converters.h"
 
 #include "base/strings/strcat.h"
 #include "base/strings/string_piece.h"

fuchsia_web/webengine/browser/url_request_rewrite_type_converters.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef FUCHSIA_ENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_
-#define FUCHSIA_ENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_
 
 #include <fuchsia/web/cpp/fidl.h>
 
 #include "components/url_rewrite/mojom/url_request_rewrite.mojom.h"
-#include "fuchsia/engine/web_engine_export.h"
+#include "fuchsia_web/webengine/web_engine_export.h"
 #include "mojo/public/cpp/bindings/type_converter.h"
 
 namespace mojo {
@@ -32,4 +32,4 @@ struct WEB_ENGINE_EXPORT
 
 }  // namespace mojo
 
-#endif  // FUCHSIA_ENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_URL_REQUEST_REWRITE_TYPE_CONVERTERS_H_

fuchsia_web/webengine/browser/url_request_rewrite_type_converters_unittest.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 "fuchsia/engine/browser/url_request_rewrite_type_converters.h"
+#include "fuchsia_web/webengine/browser/url_request_rewrite_type_converters.h"
 
 #include <lib/fidl/cpp/binding.h>
 

fuchsia_web/webengine/browser/virtual_keyboard_browsertest.cc

@@ -18,14 +18,14 @@
 #include "fuchsia/base/test/frame_test_util.h"
 #include "fuchsia/base/test/scoped_connection_checker.h"
 #include "fuchsia/base/test/test_navigation_listener.h"
-#include "fuchsia/engine/browser/context_impl.h"
+#include "fuchsia_web/webengine/browser/context_impl.h"
-#include "fuchsia/engine/browser/frame_impl.h"
+#include "fuchsia_web/webengine/browser/frame_impl.h"
-#include "fuchsia/engine/browser/mock_virtual_keyboard.h"
+#include "fuchsia_web/webengine/browser/mock_virtual_keyboard.h"
-#include "fuchsia/engine/features.h"
+#include "fuchsia_web/webengine/features.h"
-#include "fuchsia/engine/test/frame_for_test.h"
+#include "fuchsia_web/webengine/test/frame_for_test.h"
-#include "fuchsia/engine/test/scenic_test_helper.h"
+#include "fuchsia_web/webengine/test/scenic_test_helper.h"
-#include "fuchsia/engine/test/test_data.h"
+#include "fuchsia_web/webengine/test/test_data.h"
-#include "fuchsia/engine/test/web_engine_browser_test.h"
+#include "fuchsia_web/webengine/test/web_engine_browser_test.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace virtualkeyboard = fuchsia::input::virtualkeyboard;

fuchsia_web/webengine/browser/web_engine_browser_context.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 "fuchsia/engine/browser/web_engine_browser_context.h"
+#include "fuchsia_web/webengine/browser/web_engine_browser_context.h"
 
 #include <lib/fdio/namespace.h>
 #include <memory>
@@ -24,8 +24,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/client_hints_controller_delegate.h"
 #include "content/public/browser/resource_context.h"
-#include "fuchsia/engine/browser/web_engine_net_log_observer.h"
+#include "fuchsia_web/webengine/browser/web_engine_net_log_observer.h"
-#include "fuchsia/engine/switches.h"
+#include "fuchsia_web/webengine/switches.h"
 #include "media/capabilities/in_memory_video_decode_stats_db_impl.h"
 #include "media/mojo/services/video_decode_perf_history.h"
 #include "services/network/public/cpp/network_switches.h"

fuchsia_web/webengine/browser/web_engine_browser_context.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 FUCHSIA_ENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_
+#ifndef FUCHSIA_WEB_WEBENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_
-#define FUCHSIA_ENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_
+#define FUCHSIA_WEB_WEBENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_
 
 #include <memory>
 
@@ -11,7 +11,7 @@
 #include "components/client_hints/browser/in_memory_client_hints_controller_delegate.h"
 #include "components/keyed_service/core/simple_factory_key.h"
 #include "content/public/browser/browser_context.h"
-#include "fuchsia/engine/browser/web_engine_permission_delegate.h"
+#include "fuchsia_web/webengine/browser/web_engine_permission_delegate.h"
 
 class WebEngineNetLogObserver;
 
@@ -78,4 +78,4 @@ class WebEngineBrowserContext final : public content::BrowserContext {
   client_hints::InMemoryClientHintsControllerDelegate client_hints_delegate_;
 };
 
-#endif  // FUCHSIA_ENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_
+#endif  // FUCHSIA_WEB_WEBENGINE_BROWSER_WEB_ENGINE_BROWSER_CONTEXT_H_