Fix cpplint errors in cc/(animation|input|layers|trees|test)/

cc/trees/proxy.h

 // Copyright 2011 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.
 
 #ifndef CC_TREES_PROXY_H_
 #define CC_TREES_PROXY_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 99 matching lines @@
   // Testing hooks
   virtual bool CommitPendingForTesting() = 0;
 
  protected:
   explicit Proxy(scoped_ptr<Thread> impl_thread);
   friend class DebugScopedSetImplThread;
   friend class DebugScopedSetMainThread;
   friend class DebugScopedSetMainThreadBlocked;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(Proxy);
-
   scoped_ptr<Thread> main_thread_;
   scoped_ptr<Thread> impl_thread_;
 #ifndef NDEBUG
   bool impl_thread_is_overridden_;
   bool is_main_thread_blocked_;
 #endif
+
+  DISALLOW_COPY_AND_ASSIGN(Proxy);
 };
 
 #ifndef NDEBUG
 class DebugScopedSetMainThreadBlocked {
  public:
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) : proxy_(proxy) {
     DCHECK(!proxy_->IsMainThreadBlocked());
     proxy_->SetMainThreadBlocked(true);
   }
   ~DebugScopedSetMainThreadBlocked() {
     DCHECK(proxy_->IsMainThreadBlocked());
     proxy_->SetMainThreadBlocked(false);
   }
  private:
   Proxy* proxy_;
 };
 #else
 class DebugScopedSetMainThreadBlocked {
  public:
   explicit DebugScopedSetMainThreadBlocked(Proxy* proxy) {}
   ~DebugScopedSetMainThreadBlocked() {}
 };
 #endif
 
-}
+}  // namespace cc
 
 #endif  // CC_TREES_PROXY_H_