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

chrome/browser/google/google_brand.cc

 // 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.
 
 #include "chrome/browser/google/google_brand.h"
 
 #include <string>
 
-
+#include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
+#include "build/build_config.h"
 #include "chrome/installer/util/google_update_settings.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/mac/keystone_glue.h"
 #elif defined(OS_CHROMEOS)
 #include "chrome/browser/google/google_brand_chromeos.h"
 #endif
 
 
 // Helpers --------------------------------------------------------------------
@@ skipping 115 matching lines @@
   DCHECK(g_brand_for_testing == NULL);
   g_brand_for_testing = brand_.c_str();
 }
 
 BrandForTesting::~BrandForTesting() {
   g_brand_for_testing = NULL;
 }
 
 
 }  // namespace google_brand