Remove MOJO_DISALLOW_COPY_AND_ASSIGN and MOJO_ALLOW_UNUSED_LOCAL.

components/mus/public/cpp/tests/window_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 "components/mus/public/cpp/window.h"
 
 #include <limits.h>
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 156 matching lines @@
 namespace {
 
 class TestProperty {
  public:
   TestProperty() {}
   virtual ~TestProperty() { last_deleted_ = this; }
   static TestProperty* last_deleted() { return last_deleted_; }
 
  private:
   static TestProperty* last_deleted_;
-  MOJO_DISALLOW_COPY_AND_ASSIGN(TestProperty);
+  DISALLOW_COPY_AND_ASSIGN(TestProperty);
 };
 
 TestProperty* TestProperty::last_deleted_ = NULL;
 
 MUS_DEFINE_OWNED_WINDOW_PROPERTY_KEY(TestProperty, kOwnedKey, NULL);
 
 }  // namespace
 
 TEST_F(WindowTest, OwnedProperty) {
   TestProperty* p3 = NULL;
@@ skipping 51 matching lines @@
   void OnTreeChanging(const TreeChangeParams& params) override {
     received_params_.push_back(params);
   }
   void OnTreeChanged(const TreeChangeParams& params) override {
     received_params_.push_back(params);
   }
 
   Window* observee_;
   std::vector<TreeChangeParams> received_params_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(TreeChangeObserver);
 };
 
 // Adds/Removes w11 to w1.
 TEST_F(WindowObserverTest, TreeChange_SimpleAddRemove) {
   TestWindow w1;
   TreeChangeObserver o1(&w1);
   EXPECT_TRUE(o1.received_params().empty());
 
   TestWindow w11;
   TreeChangeObserver o11(&w11);
@@ skipping 220 matching lines @@
     Change change;
     change.window = window;
     change.relative_window = relative_window;
     change.direction = direction;
     changes_.push_back(change);
   }
 
   Window* observee_;
   Changes changes_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(OrderChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, Order) {
   TestWindow w1, w11, w12, w13;
   w1.AddChild(&w11);
   w1.AddChild(&w12);
   w1.AddChild(&w13);
 
@@ skipping 125 matching lines @@
                              const gfx::Rect& new_bounds) override {
     changes_.push_back(base::StringPrintf(
         "window=%s old_bounds=%s new_bounds=%s phase=changed",
         WindowIdToString(window->id()).c_str(),
         RectToString(old_bounds).c_str(), RectToString(new_bounds).c_str()));
   }
 
   Window* window_;
   Changes changes_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(BoundsChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, SetBounds) {
   TestWindow w1;
   {
     BoundsChangeObserver observer(&w1);
     w1.SetBounds(gfx::Rect(0, 0, 100, 100));
 
@@ skipping 34 matching lines @@
   void OnWindowVisibilityChanged(Window* window) override {
     changes_.push_back(
         base::StringPrintf("window=%s phase=changed wisibility=%s",
                            WindowIdToString(window->id()).c_str(),
                            window->visible() ? "true" : "false"));
   }
 
   Window* window_;
   Changes changes_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(VisibilityChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, SetVisible) {
   TestWindow w1;
   EXPECT_FALSE(w1.visible());
   w1.SetVisible(true);
   EXPECT_TRUE(w1.visible());
   {
@@ skipping 91 matching lines @@
       return "NULL";
     gfx::Size size =
         mojo::TypeConverter<gfx::Size, const std::vector<uint8_t>>::Convert(
             *data);
     return base::StringPrintf("%d,%d", size.width(), size.height());
   }
 
   Window* window_;
   Changes changes_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(SharedPropertyChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, SetSharedProperty) {
   TestWindow w1;
   gfx::Size size(100, 100);
 
   {
     // Change visibility from true to false and make sure we get notifications.
@@ skipping 65 matching lines @@
                                     const void* key,
                                     intptr_t old) override {
     property_key_ = key;
     old_property_value_ = old;
   }
 
   Window* window_;
   const void* property_key_;
   intptr_t old_property_value_;
 
-  MOJO_DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
+  DISALLOW_COPY_AND_ASSIGN(LocalPropertyChangeObserver);
 };
 
 }  // namespace
 
 TEST_F(WindowObserverTest, LocalPropertyChanged) {
   TestWindow w1;
   LocalPropertyChangeObserver o(&w1);
 
   static const WindowProperty<int> prop = {-2};
 
@@ skipping 226 matching lines @@
   scoped_ptr<TestWindow> window0(CreateTestWindow(1, parent.get()));
   scoped_ptr<TestWindow> window1(CreateTestWindow(2, parent.get()));
 
   TestWindow* window2 = CreateTestWindow(3, parent.get());
 
   window0->AddTransientWindow(window2);
   EXPECT_EQ("1 3 2", ChildWindowIDsAsString(parent.get()));
 }
 
 }  // namespace mus