Switch to standard integer types in chrome/browser/, part 1 of 4.

chrome/browser/android/compositor/scene_layer/contextual_search_scene_layer.h

 // Copyright 2015 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 CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LAYER_H_
 #define CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LAYER_H_
 
 #include <vector>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/android/compositor/scene_layer/scene_layer.h"
 
 namespace chrome {
 namespace android {
 
 class ContextualSearchLayer;
 
 class ContextualSearchSceneLayer : public SceneLayer {
  public:
@@ skipping 56 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(ContextualSearchSceneLayer);
 };
 
 bool RegisterContextualSearchSceneLayer(JNIEnv* env);
 
 }  // namespace android
 }  // namespace chrome
 
 #endif  // CHROME_BROWSER_ANDROID_COMPOSITOR_SCENE_LAYER_CONTEXTUAL_SEARCH_SCENE_LAYER_H_