| Index: tools/android/forwarder2/device_controller.h
 | 
| diff --git a/tools/android/forwarder2/device_controller.h b/tools/android/forwarder2/device_controller.h
 | 
| index 567a08d936b695625e95ccf6477bc3edcecbf006..5a31e7be9e87ace53e9f75ce998b696d4d8ebe59 100644
 | 
| --- a/tools/android/forwarder2/device_controller.h
 | 
| +++ b/tools/android/forwarder2/device_controller.h
 | 
| @@ -7,8 +7,8 @@
 | 
|  
 | 
|  #include <string>
 | 
|  
 | 
| -#include "base/basictypes.h"
 | 
|  #include "base/containers/hash_tables.h"
 | 
| +#include "base/macros.h"
 | 
|  #include "base/memory/linked_ptr.h"
 | 
|  #include "base/memory/ref_counted.h"
 | 
|  #include "base/memory/scoped_ptr.h"
 | 
| 
 |