Drop all uses of //base except ObserverList from view mgr client lib

mojo/services/view_manager/public/cpp/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/view_manager/public/cpp/view.h"
 
 #include "base/logging.h"
 #include "base/strings/stringprintf.h"
 #include "mojo/services/view_manager/public/cpp/lib/view_private.h"
 #include "mojo/services/view_manager/public/cpp/util.h"
 #include "mojo/services/view_manager/public/cpp/view_observer.h"
 #include "mojo/services/view_manager/public/cpp/view_property.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 
 // View ------------------------------------------------------------------------
 
 typedef testing::Test ViewTest;
 
 // Subclass with public ctor/dtor.
 class TestView : public View {
  public:
   TestView() {
     ViewPrivate(this).set_id(1);
   }
   ~TestView() {}
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(TestView);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(TestView);
 };
 
 TEST_F(ViewTest, AddChild) {
   TestView v1;
   TestView v11;
   v1.AddChild(&v11);
   EXPECT_EQ(1U, v1.children().size());
 }
 
 TEST_F(ViewTest, RemoveChild) {
@@ skipping 100 matching lines @@
 namespace {
 
 class TestProperty {
  public:
   TestProperty() {}
   virtual ~TestProperty() { last_deleted_ = this; }
   static TestProperty* last_deleted() { return last_deleted_; }
 
  private:
   static TestProperty* last_deleted_;
-  DISALLOW_COPY_AND_ASSIGN(TestProperty);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(TestProperty);
 };
 
 TestProperty* TestProperty::last_deleted_ = NULL;
 
 DEFINE_OWNED_VIEW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
 
 }  // namespace
 
 TEST_F(ViewTest, OwnedProperty) {
   TestProperty* p3 = NULL;
@@ skipping 53 matching lines @@
   void OnTreeChanging(const TreeChangeParams& params) override {
      received_params_.push_back(params);
    }
    void OnTreeChanged(const TreeChangeParams& params) override {
     received_params_.push_back(params);
   }
 
   View* observee_;
   std::vector<TreeChangeParams> received_params_;
 
-  DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
 };
 
 // Adds/Removes v11 to v1.
 TEST_F(ViewObserverTest, TreeChange_SimpleAddRemove) {
   TestView v1;
   TreeChangeObserver o1(&v1);
   EXPECT_TRUE(o1.received_params().empty());
 
   TestView v11;
   TreeChangeObserver o11(&v11);
@@ skipping 220 matching lines @@
     Change change;
     change.view = view;
     change.relative_view = relative_view;
     change.direction = direction;
     changes_.push_back(change);
   }
 
   View* observee_;
   Changes changes_;
 
-  DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, Order) {
   TestView v1, v11, v12, v13;
   v1.AddChild(&v11);
   v1.AddChild(&v12);
   v1.AddChild(&v13);
 
@@ skipping 129 matching lines @@
         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);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, SetBounds) {
   TestView v1;
   {
     BoundsChangeObserver observer(&v1);
     Rect rect;
     rect.width = rect.height = 100;
@@ skipping 35 matching lines @@
   }
   void OnViewVisibilityChanged(View* view) override {
     changes_.push_back(base::StringPrintf("view=%s phase=changed visibility=%s",
                                           ViewIdToString(view->id()).c_str(),
                                           view->visible() ? "true" : "false"));
   }
 
   View* view_;
   Changes changes_;
 
-  DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, SetVisible) {
   TestView v1;
   EXPECT_TRUE(v1.visible());
   {
     // Change visibility from true to false and make sure we get notifications.
     VisibilityChangeObserver observer(&v1);
@@ skipping 85 matching lines @@
       return "NULL";
     std::string s;
     for (char c : *data)
       s += c;
     return s;
   }
 
   View* view_;
   Changes changes_;
 
-  DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, SetLocalProperty) {
   TestView v1;
   std::vector<uint8_t> one(1, '1');
 
   {
     // Change visibility from true to false and make sure we get notifications.
@@ skipping 60 matching lines @@
                                   const void* key,
                                   intptr_t old) override {
     property_key_ = key;
     old_property_value_ = old;
   }
 
   View* view_;
   const void* property_key_;
   intptr_t old_property_value_;
 
-  DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
+  MOJO_DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(ViewObserverTest, LocalPropertyChanged) {
   TestView v1;
   LocalPropertyChangeObserver o(&v1);
 
   static const ViewProperty<int> prop = {-2};
 
   v1.SetLocalProperty(&prop, 1);
   EXPECT_EQ(PropertyChangeInfo(&prop, -2), o.PropertyChangeInfoAndClear());
   v1.SetLocalProperty(&prop, -2);
   EXPECT_EQ(PropertyChangeInfo(&prop, 1), o.PropertyChangeInfoAndClear());
   v1.SetLocalProperty(&prop, 3);
   EXPECT_EQ(PropertyChangeInfo(&prop, -2), o.PropertyChangeInfoAndClear());
   v1.ClearLocalProperty(&prop);
   EXPECT_EQ(PropertyChangeInfo(&prop, 3), o.PropertyChangeInfoAndClear());
 
   // Sanity check to see if |PropertyChangeInfoAndClear| really clears.
   EXPECT_EQ(PropertyChangeInfo(
       reinterpret_cast<const void*>(NULL), -3), o.PropertyChangeInfoAndClear());
 }
 
 }  // namespace mojo