Revert of Mandoline UI Process: Update namespaces and file names

components/mus/test_change_tracker.h

Index: components/mus/test_change_tracker.h
diff --git a/components/mus/test_change_tracker.h b/components/mus/test_change_tracker.h
index 358a4645a41dbae35360f34f0552cb3645ef2a5f..a8a5b281a94d895d95de5605b65b01e760177b6e 100644
--- a/components/mus/test_change_tracker.h
+++ b/components/mus/test_change_tracker.h
@@ -14,7 +14,7 @@
 #include "third_party/mojo/src/mojo/public/cpp/bindings/array.h"
 #include "ui/mojo/geometry/geometry.mojom.h"
 
-namespace mus {
+namespace view_manager {
 
 enum ChangeType {
   CHANGE_TYPE_EMBED,
@@ -45,8 +45,8 @@
   // Returns a string description that includes visible and drawn.
   std::string ToString2() const;
 
-  Id parent_id;
-  Id view_id;
+  mojo::Id parent_id;
+  mojo::Id view_id;
   bool visible;
   bool drawn;
   std::map<std::string, std::vector<uint8_t>> properties;
@@ -59,11 +59,11 @@
   ~Change();
 
   ChangeType type;
-  ConnectionSpecificId connection_id;
+  mojo::ConnectionSpecificId connection_id;
   std::vector<TestView> views;
-  Id view_id;
-  Id view_id2;
-  Id view_id3;
+  mojo::Id view_id;
+  mojo::Id view_id2;
+  mojo::Id view_id3;
   mojo::Rect bounds;
   mojo::Rect bounds2;
   int32_t event_action;
@@ -117,29 +117,30 @@
 
   // Each of these functions generate a Change. There is one per
   // ViewTreeClient function.
-  void OnEmbed(ConnectionSpecificId connection_id, mojo::ViewDataPtr root);
-  void OnEmbeddedAppDisconnected(Id view_id);
+  void OnEmbed(mojo::ConnectionSpecificId connection_id,
+               mojo::ViewDataPtr root);
+  void OnEmbeddedAppDisconnected(mojo::Id view_id);
   void OnUnembed();
-  void OnViewBoundsChanged(Id view_id,
+  void OnViewBoundsChanged(mojo::Id view_id,
                            mojo::RectPtr old_bounds,
                            mojo::RectPtr new_bounds);
   void OnViewViewportMetricsChanged(mojo::ViewportMetricsPtr old_bounds,
                                     mojo::ViewportMetricsPtr new_bounds);
-  void OnViewHierarchyChanged(Id view_id,
-                              Id new_parent_id,
-                              Id old_parent_id,
+  void OnViewHierarchyChanged(mojo::Id view_id,
+                              mojo::Id new_parent_id,
+                              mojo::Id old_parent_id,
                               mojo::Array<mojo::ViewDataPtr> views);
-  void OnViewReordered(Id view_id,
-                       Id relative_view_id,
+  void OnViewReordered(mojo::Id view_id,
+                       mojo::Id relative_view_id,
                        mojo::OrderDirection direction);
-  void OnViewDeleted(Id view_id);
-  void OnViewVisibilityChanged(Id view_id, bool visible);
-  void OnViewDrawnStateChanged(Id view_id, bool drawn);
-  void OnViewInputEvent(Id view_id, mojo::EventPtr event);
-  void OnViewSharedPropertyChanged(Id view_id,
+  void OnViewDeleted(mojo::Id view_id);
+  void OnViewVisibilityChanged(mojo::Id view_id, bool visible);
+  void OnViewDrawnStateChanged(mojo::Id view_id, bool drawn);
+  void OnViewInputEvent(mojo::Id view_id, mojo::EventPtr event);
+  void OnViewSharedPropertyChanged(mojo::Id view_id,
                                    mojo::String name,
                                    mojo::Array<uint8_t> data);
-  void OnViewFocused(Id view_id);
+  void OnViewFocused(mojo::Id view_id);
   void DelegateEmbed(const mojo::String& url);
 
  private:
@@ -151,6 +152,6 @@
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
-}  // namespace mus
+}  // namespace view_manager
 
 #endif  // COMPONENTS_MUS_TEST_CHANGE_TRACKER_H_