Moves components/mus/examples into mash

BUG=none
TEST=none
R=ben@chromium.org

Review URL: https://codereview.chromium.org/1469733004

Cr-Commit-Position: refs/heads/master@{#361177}

BUILD.gn

@@ -604,7 +604,7 @@ group("gn_only") {
   }
 
   if (!is_component_build && (is_win || is_linux)) {
-    deps += [ "//components/mus/example:all" ]
+    deps += [ "//mash:all" ]
   }
 
   if (is_linux && !is_chromeos && !is_chromecast) {

mandoline/BUILD.gn

@@ -17,8 +17,8 @@ group("all") {
     deps += [ "//mandoline/app/android" ]
   } else {
     deps += [
-      "//components/mus/example",
       "//mandoline/app/desktop",
+      "//mash/example",
     ]
   }
 }

components/mus/example/BUILD.gn → mash/BUILD.gn

@@ -9,25 +9,12 @@ group("all") {
   testonly = true
 
   deps = [
-    ":example",
-    ":mustash_unittests",
+    ":mash_unittests",
+    "//mash/example",
   ]
 }
 
-group("example") {
-  testonly = true
-
-  deps = [
-    "//components/mus/example/main",
-    "//components/mus/example/mock_sysui",
-    "//components/mus/example/views_examples",
-    "//components/mus/example/window_type_launcher",
-    "//mash/wm",
-    "//mojo/runner",
-  ]
-}
-
-test("mustash_unittests") {
+test("mash_unittests") {
   deps = [
     "//base",
     "//base/test:run_all_unittests",

mash/example/BUILD.gn

+# Copyright 2015 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("//testing/test.gni")
+
+group("example") {
+  testonly = true
+
+  deps = [
+    "//mash/example/main",
+    "//mash/example/mock_sysui",
+    "//mash/example/views_examples",
+    "//mash/example/window_type_launcher",
+    "//mash/wm",
+    "//mojo/runner",
+  ]
+}

components/mus/example/common/mus_views_init.h → mash/example/common/mus_views_init.h

@@ -2,9 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
-#define COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
+#ifndef MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
+#define MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
 
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
@@ -50,4 +51,4 @@ class MUSViewsInit : public views::ViewsDelegate,
   DISALLOW_COPY_AND_ASSIGN(MUSViewsInit);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_
+#endif  // MASH_EXAMPLE_COMMON_MUS_VIEWS_INIT_H_

components/mus/example/main/BUILD.gn → mash/example/main/BUILD.gn

@@ -25,7 +25,7 @@ mojo_native_application("main") {
   ]
 
   data_deps = [
-    "//components/mus/example/views_examples",
-    "//components/mus/example/window_type_launcher",
+    "//mash/example/views_examples",
+    "//mash/example/window_type_launcher",
   ]
 }

components/mus/example/main/main.cc → mash/example/main/main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/main/main_application_delegate.h"
+#include "mash/example/main/main_application_delegate.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 

components/mus/example/main/main_application_delegate.cc → mash/example/main/main_application_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/main/main_application_delegate.h"
+#include "mash/example/main/main_application_delegate.h"
 
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"

components/mus/example/main/main_application_delegate.h → mash/example/main/main_application_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_
-#define COMPONENTS_MUS_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_
+#ifndef MASH_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_
+#define MASH_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_vector.h"
@@ -30,4 +30,4 @@ class MainApplicationDelegate : public mojo::ApplicationDelegate {
   DISALLOW_COPY_AND_ASSIGN(MainApplicationDelegate);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_
+#endif  // MASH_EXAMPLE_MAIN_MAIN_APPLICATION_DELEGATE_H_

components/mus/example/mock_sysui/main.cc → mash/example/mock_sysui/main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/mock_sysui/mock_sysui.h"
+#include "mash/example/mock_sysui/mock_sysui.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 

components/mus/example/mock_sysui/mock_sysui.cc → mash/example/mock_sysui/mock_sysui.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/mock_sysui/mock_sysui.h"
+#include "mash/example/mock_sysui/mock_sysui.h"
 
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/container.mojom.h"

components/mus/example/mock_sysui/mock_sysui.h → mash/example/mock_sysui/mock_sysui.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_
-#define COMPONENTS_MUS_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_
+#ifndef MASH_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_
+#define MASH_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -32,4 +32,4 @@ class MockSysUI : public mojo::ApplicationDelegate {
   DISALLOW_COPY_AND_ASSIGN(MockSysUI);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_
+#endif  // MASH_EXAMPLE_MOCK_SYSUI_MOCK_SYSUI_H_

components/mus/example/views_examples/main.cc → mash/example/views_examples/main.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/views_examples/views_examples_application_delegate.h"
+#include "mash/example/views_examples/views_examples_application_delegate.h"
 #include "mojo/application/public/cpp/application_runner.h"
 #include "mojo/public/c/system/main.h"
 

components/mus/example/views_examples/views_examples_application_delegate.cc → mash/example/views_examples/views_examples_application_delegate.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/views_examples/views_examples_application_delegate.h"
+#include "mash/example/views_examples/views_examples_application_delegate.h"
 
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_impl.h"

components/mus/example/views_examples/views_examples_application_delegate.h → mash/example/views_examples/views_examples_application_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_CLIENT_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
-#define COMPONENTS_MUS_EXAMPLE_CLIENT_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
+#ifndef MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
+#define MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -32,4 +32,4 @@ class ViewsExamplesApplicationDelegate : public mojo::ApplicationDelegate {
   DISALLOW_COPY_AND_ASSIGN(ViewsExamplesApplicationDelegate);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_CLIENT_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_
+#endif  // MASH_EXAMPLE_VIEWS_EXAMPLES_APPLICATION_DELEGATE_H_

components/mus/example/window_type_launcher/main.cc → mash/example/window_type_launcher/main.cc

@@ -10,7 +10,7 @@
 #include "base/process/launch.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
-#include "components/mus/example/window_type_launcher/window_type_launcher.h"
+#include "mash/example/window_type_launcher/window_type_launcher.h"
 #include "mojo/application/public/cpp/application_impl.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/message_pump/message_pump_mojo.h"

components/mus/example/window_type_launcher/window_type_launcher.cc → mash/example/window_type_launcher/window_type_launcher.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/mus/example/window_type_launcher/window_type_launcher.h"
+#include "mash/example/window_type_launcher/window_type_launcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/application/public/cpp/application_connection.h"

components/mus/example/window_type_launcher/window_type_launcher.h → mash/example/window_type_launcher/window_type_launcher.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
-#define COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
+#ifndef MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
+#define MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
@@ -29,4 +29,4 @@ class WindowTypeLauncher : public mojo::ApplicationDelegate {
   DISALLOW_COPY_AND_ASSIGN(WindowTypeLauncher);
 };
 
-#endif  // COMPONENTS_MUS_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_
+#endif  // MASH_EXAMPLE_WINDOW_TYPE_LAUNCHER_WINDOW_TYPE_LAUNCHER_H_

testing/buildbot/chromium.linux.json

@@ -301,8 +301,8 @@
   "Linux Builder": {
     "additional_compile_targets": [
       "blimp",
-      "components/mus/example:all",
       "mandoline:all",
+      "mash:all",
       "remoting_all"
     ]
   },
@@ -503,6 +503,9 @@
         },
         "test": "jingle_unittests"
       },
+      {
+        "test": "mash_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -569,9 +572,6 @@
       {
         "test": "mojo_view_manager_lib_unittests"
       },
-      {
-        "test": "mustash_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.win.json

@@ -1558,7 +1558,6 @@
       "chromedriver_unittests",
       "components_browsertests",
       "components_unittests",
-      "components/mus/example:all",
       "compositor_unittests",
       "content_unittests",
       "courgette_unittests",
@@ -1576,6 +1575,7 @@
       "jingle_unittests",
       "keyboard_unittests",
       "mandoline:all",
+      "mash:all",
       "media_unittests",
       "media_blink_unittests",
       "message_center_unittests",
@@ -1641,7 +1641,7 @@
         "test": "mojo_view_manager_lib_unittests"
       },
       {
-        "test": "mustash_unittests"
+        "test": "mash_unittests"
       },
       {
         "test": "resource_provider_unittests"

testing/buildbot/gn_isolate_map.pyl

@@ -308,8 +308,8 @@
     "label": "//ui/message_center:message_center_unittests",
     "type": "unknown",
   },
-  "mustash_unittests": {
-    "label": "//components/mus/example:mustash_unittests",
+  "mash_unittests": {
+    "label": "//mash:mash_unittests",
     "type": "unknown",
   },
   "nacl_loader_unittests": {