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

chrome/browser/media_galleries/media_galleries_test_util.cc

 // Copyright (c) 2012 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/media_galleries/media_galleries_test_util.h"
 
-#if defined(OS_WIN)
-#include <windows.h>
-#endif
+#include <stddef.h>
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
+#include "build/build_config.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/media_galleries/fileapi/picasa_finder.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_paths.h"
 #include "components/crx_file/id_util.h"
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/iapps_finder_impl.h"
 #include "components/policy/core/common/preferences_mock_mac.h"
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
+#include <windows.h>
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #endif  // OS_WIN
 
 scoped_refptr<extensions::Extension> AddMediaGalleriesApp(
     const std::string& name,
     const std::vector<std::string>& media_galleries_permissions,
     Profile* profile) {
   scoped_ptr<base::DictionaryValue> manifest(new base::DictionaryValue);
   manifest->SetString(extensions::manifest_keys::kName, name);
@@ skipping 185 matching lines @@
 
 base::FilePath MakeMediaGalleriesTestingPath(const std::string& dir) {
 #if defined(OS_WIN)
   return base::FilePath(FILE_PATH_LITERAL("C:\\")).AppendASCII(dir);
 #elif defined(OS_POSIX)
   return base::FilePath(FILE_PATH_LITERAL("/")).Append(dir);
 #else
   NOTREACHED();
 #endif
 }