Mandoline: Rename components/view_manager to components/mus

components/mus/view_tree_unittest.cc

Index: components/mus/view_tree_unittest.cc
diff --git a/components/view_manager/view_tree_unittest.cc b/components/mus/view_tree_unittest.cc
similarity index 91%
rename from components/view_manager/view_tree_unittest.cc
rename to components/mus/view_tree_unittest.cc
index 485b7095a6ce9613a12255522f3699922f123108..f1f86cd0c94132906c22d4c830c4caffd820b7e0 100644
--- a/components/view_manager/view_tree_unittest.cc
+++ b/components/mus/view_tree_unittest.cc
@@ -6,20 +6,20 @@
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
-#include "components/view_manager/client_connection.h"
-#include "components/view_manager/connection_manager.h"
-#include "components/view_manager/connection_manager_delegate.h"
-#include "components/view_manager/display_manager.h"
-#include "components/view_manager/display_manager_factory.h"
-#include "components/view_manager/ids.h"
-#include "components/view_manager/public/cpp/types.h"
-#include "components/view_manager/public/cpp/util.h"
-#include "components/view_manager/public/interfaces/view_tree.mojom.h"
-#include "components/view_manager/server_view.h"
-#include "components/view_manager/surfaces/surfaces_state.h"
-#include "components/view_manager/test_change_tracker.h"
-#include "components/view_manager/view_tree_host_connection.h"
-#include "components/view_manager/view_tree_impl.h"
+#include "components/mus/client_connection.h"
+#include "components/mus/connection_manager.h"
+#include "components/mus/connection_manager_delegate.h"
+#include "components/mus/display_manager.h"
+#include "components/mus/display_manager_factory.h"
+#include "components/mus/ids.h"
+#include "components/mus/public/cpp/types.h"
+#include "components/mus/public/cpp/util.h"
+#include "components/mus/public/interfaces/view_tree.mojom.h"
+#include "components/mus/server_view.h"
+#include "components/mus/surfaces/surfaces_state.h"
+#include "components/mus/test_change_tracker.h"
+#include "components/mus/view_tree_host_connection.h"
+#include "components/mus/view_tree_impl.h"
 #include "mojo/application/public/interfaces/service_provider.mojom.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -178,18 +178,17 @@ class TestConnectionManagerDelegate : public ConnectionManagerDelegate {
 
 class TestViewTreeHostConnection : public ViewTreeHostConnection {
  public:
-   TestViewTreeHostConnection(scoped_ptr<ViewTreeHostImpl> host_impl,
-                              ConnectionManager* manager)
-        : ViewTreeHostConnection(host_impl.Pass(), manager) {}
-   ~TestViewTreeHostConnection() override {}
+  TestViewTreeHostConnection(scoped_ptr<ViewTreeHostImpl> host_impl,
+                             ConnectionManager* manager)
+      : ViewTreeHostConnection(host_impl.Pass(), manager) {}
+  ~TestViewTreeHostConnection() override {}
 
  private:
   // ViewTreeHostDelegate:
   void OnDisplayInitialized() override {
     connection_manager()->AddHost(this);
     set_view_tree(connection_manager()->EmbedAtView(
-        kInvalidConnectionId,
-        view_tree_host()->root_view()->id(),
+        kInvalidConnectionId, view_tree_host()->root_view()->id(),
         mojo::ViewTreeClientPtr()));
   }
   DISALLOW_COPY_AND_ASSIGN(TestViewTreeHostConnection);
@@ -301,13 +300,11 @@ class ViewTreeTest : public testing::Test {
   void SetUp() override {
     DisplayManager::set_factory_for_testing(&display_manager_factory_);
     // TODO(fsamuel): This is probably broken. We need a root.
-    connection_manager_.reset(
-        new ConnectionManager(&delegate_,
-                              scoped_refptr<surfaces::SurfacesState>()));
+    connection_manager_.reset(new ConnectionManager(
+        &delegate_, scoped_refptr<surfaces::SurfacesState>()));
     ViewTreeHostImpl* host = new ViewTreeHostImpl(
-        mojo::ViewTreeHostClientPtr(),
-        connection_manager_.get(), true /* is_headless */, nullptr,
-        scoped_refptr<gles2::GpuState>(),
+        mojo::ViewTreeHostClientPtr(), connection_manager_.get(),
+        true /* is_headless */, nullptr, scoped_refptr<gles2::GpuState>(),
         scoped_refptr<surfaces::SurfacesState>());
     // TODO(fsamuel): This is way too magical. We need to find a better way to
     // manage lifetime.
@@ -336,8 +333,8 @@ TEST_F(ViewTreeTest, FocusOnPointer) {
   EXPECT_TRUE(wm_connection()->SetViewVisibility(embed_view_id, true));
   EXPECT_TRUE(
       wm_connection()->AddView(*(wm_connection()->root()), embed_view_id));
-  host_connection()->view_tree_host()->root_view()->
-      SetBounds(gfx::Rect(0, 0, 100, 100));
+  host_connection()->view_tree_host()->root_view()->SetBounds(
+      gfx::Rect(0, 0, 100, 100));
   mojo::URLRequestPtr request(mojo::URLRequest::New());
   wm_connection()->Embed(embed_view_id, request.Pass());
   ViewTreeImpl* connection1 =