diff --git a/BUILD.gn b/BUILD.gn
index e1f9e9f3af67d9..e2df773aadde1c 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -198,10 +198,10 @@ group("gn_all") {
       "//mojo/edk/test:mojo_public_system_unittests",
       "//net:net_perftests",
       "//storage:storage_unittests",
+      "//third_party/WebKit/Source/controller:webkit_unit_tests",
       "//third_party/WebKit/Source/platform:blink_platform_unittests",
       "//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
       "//third_party/WebKit/Source/platform/wtf:wtf_unittests",
-      "//third_party/WebKit/Source/web:webkit_unit_tests",
       "//third_party/angle/src/tests:angle_end2end_tests",
       "//third_party/angle/src/tests:angle_unittests",
       "//third_party/angle/src/tests:angle_white_box_tests",
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 63838cdd5fc249..71a4061f7e73f0 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1112,7 +1112,7 @@
     ],
   },
   "webkit_unit_tests": {
-    "label": "//third_party/WebKit/Source/web:webkit_unit_tests",
+    "label": "//third_party/WebKit/Source/controller:webkit_unit_tests",
     "type": "console_test_launcher",
   },
   "webview_instrumentation_test_apk": {
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
index e9b6f16d786e4d..86f1b8a257aeb3 100644
--- a/third_party/WebKit/LayoutTests/TestExpectations
+++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -2919,9 +2919,18 @@ crbug.com/736177 [ Mac10.12 ] fast/css/clip-zooming.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/css/h1-in-section-elements.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/css/rem-calc-dynamic-scaling.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/css/rem-dynamic-scaling.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/css/text-overflow-input.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/dom/HTMLMeterElement/meter-optimums.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/dynamic/012.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/control-restrict-line-height.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/forms/form-element-geometry.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/input-appearance-height.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/placeholder-position.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/search/search-appearance-basic.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/search/search-cancel-button-style-sharing.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/search/search-display-none-cancel-button.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/search/search-rtl.html [ Failure Pass ]
+crbug.com/736177 [ Mac10.12 ] fast/forms/search/searchfield-heights.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/inline/absolute-positioned-inline-in-centred-block.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/inline/left-right-center-inline-alignment-in-ltr-and-rtl-blocks.html [ Failure Pass ]
 crbug.com/736177 [ Mac10.12 ] fast/lists/ordered-list-with-no-ol-tag.html [ Failure Pass ]
@@ -3029,9 +3038,11 @@ crbug.com/626703 [ Win7 ] external/wpt/html/semantics/tabular-data/processing-mo
 
 # Sheriff failure 2017-08-07
 crbug.com/708499 [ Win7 Mac10.11 Retina Debug ] virtual/wheelscrolllatching/fast/compositor-wheel-scroll-latching/touchpad-scroll-impl-to-main.html [ Failure Pass ]
-crbug.com/752845 [ Win7 Debug ] inspector/sha1.html [ Crash ]
+crbug.com/752845 [ Win ] inspector/sha1.html [ Pass Crash ]
 
 # Ganesh dither changes
 crbug.com/753462 virtual/gpu/fast/canvas/canvas-text-alignment.html [ NeedsManualRebaseline ]
 crbug.com/753462 virtual/gpu/fast/canvas/fillrect_gradient.html [ NeedsManualRebaseline ]
 crbug.com/753462 virtual/gpu/fast/canvas/gradient-add-second-start-end-stop.html [ NeedsManualRebaseline ]
+
+crbug.com/746904 [ Win ] fast/text/ellipsis-in-relative-inline.html [ Failure Pass ]
diff --git a/third_party/WebKit/PRESUBMIT.py b/third_party/WebKit/PRESUBMIT.py
index 39c284936573cd..5cb3f747614d41 100644
--- a/third_party/WebKit/PRESUBMIT.py
+++ b/third_party/WebKit/PRESUBMIT.py
@@ -203,7 +203,7 @@ def _CheckForForbiddenNamespace(input_api, output_api):
     def source_file_filter(path):
         return input_api.FilterSourceFile(path,
                                           white_list=[r'third_party/WebKit/Source/.*\.(h|cpp)$'],
-                                          black_list=[r'third_party/WebKit/Source/(platform|wtf|web)/'])
+                                          black_list=[r'third_party/WebKit/Source/(platform|wtf|web|controller)/'])
 
     comment_re = input_api.re.compile(r'^\s*//')
     result = []
diff --git a/third_party/WebKit/Source/controller/BUILD.gn b/third_party/WebKit/Source/controller/BUILD.gn
index 517009d8f45ebb..dbcd69337de86d 100644
--- a/third_party/WebKit/Source/controller/BUILD.gn
+++ b/third_party/WebKit/Source/controller/BUILD.gn
@@ -49,3 +49,62 @@ component("controller") {
     configs += remove_webcore_symbols_config
   }
 }
+
+group("webkit_unit_tests_data") {
+  data = [
+    "../core/testing/data/",
+    "../core/paint/test_data/",
+  ]
+}
+
+test("webkit_unit_tests") {
+  visibility = []  # Allow re-assignment of list.
+  visibility = [ "*" ]
+
+  sources = [
+    "tests/RunAllTests.cpp",
+  ]
+  sources += bindings_unittest_files
+
+  deps = [
+    ":controller",
+    "//base",
+    "//base:i18n",
+    "//base/test:test_support",
+    "//content/test:test_support",
+    "//gpu:test_support",
+    "//services/device/public/interfaces:interfaces_blink",
+    "//testing/gmock",
+    "//testing/gtest",
+    "//third_party/WebKit/Source/core:unit_tests",
+    "//third_party/WebKit/Source/modules:unit_tests",
+    "//third_party/WebKit/Source/modules/exported:test_support",
+    "//third_party/WebKit/Source/platform:test_support",
+    "//third_party/WebKit/Source/platform:unit_tests",
+    "//third_party/WebKit/Source/platform/wtf",
+    "//third_party/libwebp",
+    "//third_party/zlib",
+    "//url",
+    "//v8",
+  ]
+
+  data_deps = [
+    ":webkit_unit_tests_data",
+    "//content/shell:pak",
+  ]
+
+  configs += [
+    "//third_party/WebKit/Source:config",
+    "//third_party/WebKit/Source:inside_blink",
+    "//third_party/WebKit/Source/core:blink_core_pch",
+  ]
+
+  if (is_android) {
+    deps += [
+      "//base:base_java",
+      "//content/public/android:content_java",
+      "//content/shell/android:content_shell_assets",
+      "//net/android:net_java",
+    ]
+  }
+}
diff --git a/third_party/WebKit/Source/web/tests/DEPS b/third_party/WebKit/Source/controller/tests/DEPS
similarity index 90%
rename from third_party/WebKit/Source/web/tests/DEPS
rename to third_party/WebKit/Source/controller/tests/DEPS
index 1e11e2516e81f3..e442447fc78497 100644
--- a/third_party/WebKit/Source/web/tests/DEPS
+++ b/third_party/WebKit/Source/controller/tests/DEPS
@@ -1,7 +1,6 @@
 include_rules = [
     "+base",
     "+mojo/public/cpp/bindings",
-    "+web/tests",
 ]
 
 specific_include_rules = {
diff --git a/third_party/WebKit/Source/web/tests/OWNERS b/third_party/WebKit/Source/controller/tests/OWNERS
similarity index 100%
rename from third_party/WebKit/Source/web/tests/OWNERS
rename to third_party/WebKit/Source/controller/tests/OWNERS
diff --git a/third_party/WebKit/Source/web/tests/RunAllTests.cpp b/third_party/WebKit/Source/controller/tests/RunAllTests.cpp
similarity index 100%
rename from third_party/WebKit/Source/web/tests/RunAllTests.cpp
rename to third_party/WebKit/Source/controller/tests/RunAllTests.cpp
diff --git a/third_party/WebKit/Source/web/BUILD.gn b/third_party/WebKit/Source/web/BUILD.gn
index fa35ef0855db8f..5dee02a4026b81 100644
--- a/third_party/WebKit/Source/web/BUILD.gn
+++ b/third_party/WebKit/Source/web/BUILD.gn
@@ -8,67 +8,3 @@ import("//third_party/WebKit/Source/bindings/bindings.gni")
 import("//third_party/WebKit/Source/config.gni")
 import("//third_party/WebKit/Source/core/core.gni")
 import("//third_party/WebKit/Source/modules/modules.gni")
-
-visibility = [ "//third_party/WebKit/*" ]
-
-group("webkit_unit_tests_data") {
-  data = [
-    "../core/testing/data/",
-    "../core/paint/test_data/",
-  ]
-}
-
-test("webkit_unit_tests") {
-  visibility = []  # Allow re-assignment of list.
-  visibility = [ "*" ]
-
-  sources = [
-    # FIXME: Move the tests from web/tests/ to appropriate places.
-    # crbug.com/353585
-
-    "tests/RunAllTests.cpp",
-  ]
-  sources += bindings_unittest_files
-
-  deps = [
-    "//base",
-    "//base:i18n",
-    "//base/test:test_support",
-    "//content/test:test_support",
-    "//gpu:test_support",
-    "//services/device/public/interfaces:interfaces_blink",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//third_party/WebKit/Source/controller",
-    "//third_party/WebKit/Source/core:unit_tests",
-    "//third_party/WebKit/Source/modules:unit_tests",
-    "//third_party/WebKit/Source/modules/exported:test_support",
-    "//third_party/WebKit/Source/platform:test_support",
-    "//third_party/WebKit/Source/platform:unit_tests",
-    "//third_party/WebKit/Source/platform/wtf",
-    "//third_party/libwebp",
-    "//third_party/zlib",
-    "//url",
-    "//v8",
-  ]
-
-  data_deps = [
-    ":webkit_unit_tests_data",
-    "//content/shell:pak",
-  ]
-
-  configs += [
-    "//third_party/WebKit/Source:config",
-    "//third_party/WebKit/Source:inside_blink",
-    "//third_party/WebKit/Source/core:blink_core_pch",
-  ]
-
-  if (is_android) {
-    deps += [
-      "//base:base_java",
-      "//content/public/android:content_java",
-      "//content/shell/android:content_shell_assets",
-      "//net/android:net_java",
-    ]
-  }
-}
diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn
index cc847663efc67f..ff35a751f62791 100644
--- a/third_party/WebKit/public/BUILD.gn
+++ b/third_party/WebKit/public/BUILD.gn
@@ -41,12 +41,12 @@ group("all_blink") {
 
   public_deps = [
     "//third_party/WebKit/Source/controller",
+    "//third_party/WebKit/Source/controller:webkit_unit_tests",
     "//third_party/WebKit/Source/core",
     "//third_party/WebKit/Source/modules",
     "//third_party/WebKit/Source/platform:blink_platform_unittests",
     "//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
     "//third_party/WebKit/Source/platform/wtf:wtf_unittests",
-    "//third_party/WebKit/Source/web:webkit_unit_tests",
   ]
 }