Rename SkyDebugger to KioskWM and move to /services

services/kiosk_wm/navigator_host_impl.h

Index: services/kiosk_wm/navigator_host_impl.h
diff --git a/sky/tools/debugger/navigator_host_impl.h b/services/kiosk_wm/navigator_host_impl.h
similarity index 51%
rename from sky/tools/debugger/navigator_host_impl.h
rename to services/kiosk_wm/navigator_host_impl.h
index 89d4b6c926d269af96afcace744911462200f44b..73f950c3fa7fa1effe28bff2253fd048058f5891 100644
--- a/sky/tools/debugger/navigator_host_impl.h
+++ b/services/kiosk_wm/navigator_host_impl.h
@@ -2,36 +2,38 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SKY_TOOLS_DEBUGGER_NAVIGATOR_HOST_IMPL_H_
-#define SKY_TOOLS_DEBUGGER_NAVIGATOR_HOST_IMPL_H_
+#ifndef SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
+#define SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_
 
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/application/interface_factory_impl.h"
 #include "mojo/services/navigation/public/interfaces/navigation.mojom.h"
 #include "sky/tools/debugger/debugger.mojom.h"

[jamesr, 2015/01/29 20:35:36]

this introduced the following interesting build flake:

http://build.chromium.org/p/client.mojo/builders/Mojo%20Android%20Builder/bui...

FAILED: /b/build/goma/gomacc
../../third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-g++
-MMD -MF obj/services/kiosk_wm/libkiosk_wm_library.main.o.d -DCHROMIUM_BUILD
-DV8_DEPRECATION_WARNINGS -DCLD_VERSION=1 -DENABLE_NOTIFICATIONS
-DENABLE_BROWSER_CDMS -DENABLE_PRINTING=1 -DENABLE_BASIC_PRINTING=1
-DUSE_OPENSSL=1 -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DDISABLE_NACL
-DENABLE_CONFIGURATION_POLICY -DENABLE_SUPERVISED_USERS=1
-DENABLE_AUTOFILL_DIALOG=1 -D_FILE_OFFSET_BITS=64 -DANDROID -DHAVE_SYS_UIO_H
-D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DUSE_STLPORT=1
-D_STLP_USE_PTR_SPECIALIZATIONS=1 -D__GNU_SOURCE=1 -DNDEBUG
-DSK_LEGACY_DRAWPICTURECALLBACK -DSK_ENABLE_INST_COUNT=0
-DGR_GL_CUSTOM_SETUP_HEADER=\"GrGLConfig_chrome.h\"
-DSK_ENABLE_LEGACY_API_ALIASING=1 -DSK_ATTR_DEPRECATED=SK_NOTHING_ARG1
-DGR_GL_IGNORE_ES3_MSAA=0 -DSK_WILL_NEVER_DRAW_PERSPECTIVE_TEXT
-DSK_SUPPORT_LEGACY_GETTOTALCLIP -DSK_SUPPORT_GPU=1 -DSK_USE_POSIX_THREADS
-DSK_BUILD_FOR_ANDROID -DUSE_CHROMIUM_SKIA -DU_USING_ICU_NAMESPACE=0
-DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -I../.. -Igen -I../.. -Igen
-I../../skia/config -I../../skia/ext -I../../third_party/skia/include/c
-I../../third_party/skia/include/config -I../../third_party/skia/include/core
-I../../third_party/skia/include/effects -I../../third_party/skia/include/images
-I../../third_party/skia/include/lazy -I../../third_party/skia/include/pathops
-I../../third_party/skia/include/pdf -I../../third_party/skia/include/pipe
-I../../third_party/skia/include/ports -I../../third_party/skia/include/utils
-I../../third_party/skia/src/core -I../../third_party/skia/src/image
-I../../third_party/skia/src/opts -I../../third_party/skia/src/pdf
-I../../third_party/skia/src/ports -I../../third_party/skia/src/sfnt
-I../../third_party/skia/src/utils -I../../third_party/skia/src/lazy
-I../../third_party/skia/include/gpu -I../../third_party/skia/src/gpu
-I../../third_party/icu/source/common -I../../third_party/icu/source/i18n
-I../../mojo/services -Igen/mojo/services -fno-strict-aliasing -march=armv7-a
-mfloat-abi=softfp -mtune=generic-armv7-a -mthumb -mthumb-interwork
-fno-tree-sra -fno-caller-saves -funwind-tables -fPIC -pipe -ffunction-sections
-funwind-tables -fno-short-enums -finline-limit=64 -mfpu=vfpv3-d16 -Wall
-Wsign-compare -Wendif-labels -Werror -Wno-missing-field-initializers
-Wno-unused-parameter -Wno-psabi -Wno-extra -Wno-ignored-qualifiers
-Wno-type-limits -Wno-unused-local-typedefs
-isystem../../third_party/android_tools/ndk/sources/cxx-stl/stlport/stlport
-fvisibility=hidden
--sysroot=/b/build/slave/mojo/build/src/third_party/android_tools/ndk/platforms/android-14/arch-arm
-fno-ident -fdata-sections -ffunction-sections -fomit-frame-pointer -Os -g2
-fno-threadsafe-statics -fvisibility-inlines-hidden -std=gnu++11 -Wno-narrowing
-Wno-literal-suffix -Wno-error=c++0x-compat -Wno-non-virtual-dtor
-Wno-sign-promo -fno-rtti -fno-exceptions -c ../../services/kiosk_wm/main.cc -o
obj/services/kiosk_wm/libkiosk_wm_library.main.o
In file included from ../../services/kiosk_wm/kiosk_wm.h:18:0,
                 from ../../services/kiosk_wm/main.cc:8:
../../services/kiosk_wm/navigator_host_impl.h:11:47: fatal error:
sky/tools/debugger/debugger.mojom.h: No such file or directory
 #include "sky/tools/debugger/debugger.mojom.h"

becuase this target doesn't say declare that it depends on anything that
generates debugger.mojom.h

 
-namespace sky {
-namespace debugger {
-class SkyDebugger;
+namespace mojo {
+namespace kiosk_wm {
+class KioskWM;
 
 class NavigatorHostImpl : public mojo::InterfaceImpl<mojo::NavigatorHost> {
  public:
-  explicit NavigatorHostImpl(SkyDebugger*);
+  explicit NavigatorHostImpl(KioskWM*);
   ~NavigatorHostImpl();
 
  private:
   void DidNavigateLocally(const mojo::String& url) override;
-  void RequestNavigate(mojo::Target target, mojo::URLRequestPtr request) override;
+  void RequestNavigate(mojo::Target target,
+                       mojo::URLRequestPtr request) override;
 
-  base::WeakPtr<SkyDebugger> debugger_;
+  base::WeakPtr<KioskWM> kiosk_wm_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigatorHostImpl);
 };
 
-typedef mojo::InterfaceFactoryImplWithContext<
-    NavigatorHostImpl, SkyDebugger> NavigatorHostFactory;
+typedef mojo::InterfaceFactoryImplWithContext<NavigatorHostImpl,
+                                              KioskWM>
+    NavigatorHostFactory;
 
-}  // namespace debugger
-}  // namespace sky
+}  // namespace kiosk_wm
+}  // namespace mojo
 
-#endif  // SKY_TOOLS_DEBUGGER_NAVIGATOR_HOST_IMPL_H_
+#endif  // SERVICES_KIOSK_WM_NAVIGATOR_HOST_IMPL_H_