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

chrome/browser/first_run/first_run_unittest.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_util.h"
+#include "base/macros.h"
 #include "base/test/scoped_path_override.h"
 #include "base/values.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/first_run/first_run_internal.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/installer/util/master_preferences.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace first_run {
 
@@ skipping 62 matching lines @@
 TEST_F(FirstRunTest,
        SetupMasterPrefsFromInstallPrefs_WelcomePageOnOSUpgradeDisabled) {
   installer::MasterPreferences install_prefs(
       "{\"distribution\":{\"welcome_page_on_os_upgrade_enabled\": false}}");
   MasterPrefs out_prefs;
   internal::SetupMasterPrefsFromInstallPrefs(install_prefs, &out_prefs);
   EXPECT_FALSE(out_prefs.welcome_page_on_os_upgrade_enabled);
 }
 
 }  // namespace first_run