Restructure public side of gpu service.

services/native_viewport/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
 import("//mojo/public/mojo_application.gni")
 
 if (is_android) {
   import("//build/config/android/config.gni")
   import("//build/config/android/rules.gni")
@@ skipping 66 matching lines @@
     "//cc/surfaces:surface_id",
     "//gpu/command_buffer/service",
     "//mojo/application",
     "//mojo/common",
     "//mojo/converters/geometry",
     "//mojo/converters/input_events",
     "//mojo/converters/surfaces",
     "//mojo/environment:chromium",
     "//services/gles2",
     "//mojo/services/geometry/public/interfaces",
+    "//mojo/services/gpu/public/interfaces",
     "//mojo/services/native_viewport/public/interfaces",
-    "//mojo/services/public/interfaces/gpu",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces",
     "//ui/events",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
     "//ui/gl",
     "//ui/platform_window",
   ]
 
   if (is_android) {
     deps += [ ":jni_headers" ]
   }
 
   if (use_x11) {
     deps += [
       "//ui/events/platform/x11",
       "//ui/platform_window/x11",
     ]
   } else {
     sources -= [ "platform_viewport_x11.cc" ]
   }
 
   if (is_win) {
     deps += [ "//ui/platform_window/win" ]
   }
 }