window_service: converts all code to be in ws namespace

This is the last step after moving all the code.
Sorry for the ginormous review. It would have been tedious to split
up.

BUG=876924
TEST=covered by tests
[email protected]

Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I237c4377115ad12fefb95a1bcf2eabe1cbef3414
Reviewed-on: https://chromium-review.googlesource.com/1195809
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#587338}
diff --git a/ash/shell_init_params.h b/ash/shell_init_params.h
index 3066e612..f1d93e62 100644
--- a/ash/shell_init_params.h
+++ b/ash/shell_init_params.h
@@ -20,9 +20,10 @@
 namespace ui {
 class ContextFactory;
 class ContextFactoryPrivate;
-namespace ws2 {
-class GpuInterfaceProvider;
 }
+
+namespace ws {
+class GpuInterfaceProvider;
 }
 
 namespace ash {
@@ -43,7 +44,7 @@
 
   // Allows gpu interfaces to be injected while avoiding direct content
   // dependencies.
-  std::unique_ptr<ui::ws2::GpuInterfaceProvider> gpu_interface_provider;
+  std::unique_ptr<ws::GpuInterfaceProvider> gpu_interface_provider;
 
   // Connector used by Shell to establish connections.
   service_manager::Connector* connector = nullptr;