Remove dependency on ui from view_manager.

mojo/services/public/cpp/view_manager/tests/view_unittest.cc

 // Copyright 2014 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.
 
 #include "mojo/services/public/cpp/view_manager/view.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/services/public/cpp/view_manager/lib/view_private.h"
 #include "mojo/services/public/cpp/view_manager/util.h"
@@ skipping 468 matching lines @@
 
 namespace {
 
 typedef std::vector<std::string> Changes;
 
 std::string ViewIdToString(Id id) {
   return (id == 0) ? "null" :
       base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
-std::string RectToString(const gfx::Rect& rect) {
+std::string RectToString(const Rect& rect) {
   return base::StringPrintf("%d,%d %dx%d",
-                            rect.x(), rect.y(), rect.width(), rect.height());
+                            rect.x, rect.y, rect.width, rect.height);
 }
 
 class BoundsChangeObserver : public ViewObserver {
  public:
   explicit BoundsChangeObserver(View* view) : view_(view) {
     view_->AddObserver(this);
   }
   ~BoundsChangeObserver() override { view_->RemoveObserver(this); }
 
   Changes GetAndClearChanges() {
     Changes changes;
     changes.swap(changes_);
     return changes;
   }
 
  private:
   // Overridden from ViewObserver:
   void OnViewBoundsChanging(View* view,
-                            const gfx::Rect& old_bounds,
-                            const gfx::Rect& new_bounds) override {
+                            const Rect& old_bounds,
+                            const Rect& new_bounds) override {
     changes_.push_back(
         base::StringPrintf(
             "view=%s old_bounds=%s new_bounds=%s phase=changing",
             ViewIdToString(view->id()).c_str(),
             RectToString(old_bounds).c_str(),
             RectToString(new_bounds).c_str()));
   }
   void OnViewBoundsChanged(View* view,
-                           const gfx::Rect& old_bounds,
-                           const gfx::Rect& new_bounds) override {
+                           const Rect& old_bounds,
+                           const Rect& new_bounds) override {
     changes_.push_back(
         base::StringPrintf(
             "view=%s old_bounds=%s new_bounds=%s phase=changed",
             ViewIdToString(view->id()).c_str(),
             RectToString(old_bounds).c_str(),
             RectToString(new_bounds).c_str()));
   }
 
   View* view_;
   Changes changes_;
 
   DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, SetBounds) {
   TestView v1;
   {
     BoundsChangeObserver observer(&v1);
-    v1.SetBounds(gfx::Rect(0, 0, 100, 100));
+    Rect rect;
+    rect.width = rect.height = 100;
+    v1.SetBounds(rect);
 
     Changes changes = observer.GetAndClearChanges();
     ASSERT_EQ(2U, changes.size());
     EXPECT_EQ(
         "view=0,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100 phase=changing",
         changes[0]);
     EXPECT_EQ(
         "view=0,1 old_bounds=0,0 0x0 new_bounds=0,0 100x100 phase=changed",
         changes[1]);
   }
@@ skipping 51 matching lines @@
   }
   {
     // Set visible to existing value and verify no notifications.
     VisibilityChangeObserver observer(&v1);
     v1.SetVisible(false);
     EXPECT_TRUE(observer.GetAndClearChanges().empty());
   }
 }
 
 }  // namespace mojo