Move //mojo/{public, edk} underneath //third_party

device/battery/battery.gyp

Index: device/battery/battery.gyp
diff --git a/device/battery/battery.gyp b/device/battery/battery.gyp
index 3b019227863f4b33aa013c5eb8ccde585abe431f..fd0ed6f139fbb976e523e2697886fe9a0117cfa8 100644
--- a/device/battery/battery.gyp
+++ b/device/battery/battery.gyp
@@ -12,7 +12,7 @@
       'target_name': 'device_battery_mojo_bindings',
       'type': 'static_library',
       'includes': [
-        '../../mojo/mojom_bindings_generator.gypi',
+        '../../third_party/mojo/mojom_bindings_generator.gypi',
       ],
       'sources': [
         'battery_monitor.mojom',
@@ -56,8 +56,8 @@
         '../../base/base.gyp:base',
         '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../../mojo/mojo_base.gyp:mojo_environment_chromium',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
+        '../../third_party/mojo/mojo_edk.gyp:mojo_system_impl',
+        '../../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings',
         'device_battery_mojo_bindings',
       ],
       'defines': [
@@ -122,7 +122,7 @@
           'type': 'none',
           'dependencies': [
             '../../base/base.gyp:base',
-            '../../mojo/mojo_public.gyp:mojo_bindings_java',
+            '../../third_party/mojo/mojo_public.gyp:mojo_bindings_java',
             'device_battery_mojo_bindings',
           ],
           'variables': {