Switch to standard integer types in components/, part 2 of 4.

components/mus/ws/test_server_window_delegate.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_TEST_SERVER_WINDOW_DELEGATE_H_
 #define COMPONENTS_MUS_WS_TEST_SERVER_WINDOW_DELEGATE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "components/mus/ws/server_window_delegate.h"
 
 namespace mus {
 
 namespace ws {
 
 struct WindowId;
 
 class TestServerWindowDelegate : public ServerWindowDelegate {
  public:
@@ skipping 12 matching lines @@
   const ServerWindow* root_window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestServerWindowDelegate);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_SERVER_WINDOW_DELEGATE_H_