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

chrome/browser/google/google_brand.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.
 //
 // This namespace provides various helpers and state relating to Google Chrome
 // distributions (such as RLZ), and specifically relating to the brand of the
 // current install. Brands are codes that are assigned to partners for tracking
 // distribution information.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__
 #define CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 
 class GURL;
 
 namespace google_brand {
 
 // Returns in |brand| the brand code or distribution tag that has been
 // assigned to a partner. Returns false if the information is not available.
 bool GetBrand(std::string* brand);
 
 // Returns in |brand| the reactivation brand code or distribution tag
@@ skipping 14 matching lines @@
 
 // This class is meant to be used only from test code, and sets the brand
 // code returned by the function GetBrand() above while the object exists.
 class BrandForTesting {
  public:
   explicit BrandForTesting(const std::string& brand);
   ~BrandForTesting();
 
  private:
   std::string brand_;
+
   DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
 };
 
 }  // namespace google_brand
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_BRAND_H__