Revert of Mandoline UI Process: Update namespaces and file names

components/html_viewer/html_widget.h

Index: components/html_viewer/html_widget.h
diff --git a/components/html_viewer/html_widget.h b/components/html_viewer/html_widget.h
index 37074ce1c7ab25a65d848ade5dbf12bd6da260e1..6e26ea8c9289e7d9223ca66eab8d6fc2e24b4f4e 100644
--- a/components/html_viewer/html_widget.h
+++ b/components/html_viewer/html_widget.h
@@ -14,9 +14,6 @@
 
 namespace mojo {
 class ApplicationImpl;
-}
-
-namespace mus {
 class View;
 }
 
@@ -34,7 +31,7 @@
 
   virtual blink::WebWidget* GetWidget() = 0;
 
-  virtual void OnViewBoundsChanged(mus::View* view) = 0;
+  virtual void OnViewBoundsChanged(mojo::View* view) = 0;
 };
 
 // Used for the root frame when the root frame is remote.
@@ -46,7 +43,7 @@
  private:
   // HTMLWidget:
   blink::WebWidget* GetWidget() override;
-  void OnViewBoundsChanged(mus::View* view) override;
+  void OnViewBoundsChanged(mojo::View* view) override;
 
   blink::WebView* web_view_;
 
@@ -60,12 +57,12 @@
   struct CreateParams {
     CreateParams(mojo::ApplicationImpl* app,
                  GlobalState* global_state,
-                 mus::View* view);
+                 mojo::View* view);
     ~CreateParams();
 
     mojo::ApplicationImpl* app;
     GlobalState* global_state;
-    mus::View* view;
+    mojo::View* view;
   };
 
   HTMLWidgetRootLocal(CreateParams* create_params);
@@ -88,11 +85,11 @@
  private:
   // HTMLWidget:
   blink::WebWidget* GetWidget() override;
-  void OnViewBoundsChanged(mus::View* view) override;
+  void OnViewBoundsChanged(mojo::View* view) override;
 
   mojo::ApplicationImpl* app_;
   GlobalState* global_state_;
-  mus::View* view_;
+  mojo::View* view_;
   blink::WebView* web_view_;
   scoped_ptr<WebLayerTreeViewImpl> web_layer_tree_view_impl_;
   scoped_ptr<ImeController> ime_controller_;
@@ -105,14 +102,14 @@
  public:
   HTMLWidgetLocalRoot(mojo::ApplicationImpl* app,
                       GlobalState* global_state,
-                      mus::View* view,
+                      mojo::View* view,
                       blink::WebLocalFrame* web_local_frame);
   ~HTMLWidgetLocalRoot() override;
 
  private:
   // HTMLWidget:
   blink::WebWidget* GetWidget() override;
-  void OnViewBoundsChanged(mus::View* view) override;
+  void OnViewBoundsChanged(mojo::View* view) override;
 
   // WebWidgetClient:
   virtual void initializeLayerTreeView();