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

chrome/browser/google/google_brand.h

Index: chrome/browser/google/google_brand.h
diff --git a/chrome/browser/google/google_brand.h b/chrome/browser/google/google_brand.h
index a653f41e72bb50375bb961afeb0452c6a06925c6..fa88dfd14230f81995a4e7bdecc0e30547823a77 100644
--- a/chrome/browser/google/google_brand.h
+++ b/chrome/browser/google/google_brand.h
@@ -12,7 +12,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 class GURL;
 
@@ -47,6 +47,7 @@ class BrandForTesting {
 
  private:
   std::string brand_;
+
   DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
 };