| Index: chrome/installer/test/resource_loader.h
|
| diff --git a/chrome/installer/test/resource_loader.h b/chrome/installer/test/resource_loader.h
|
| index b43056c42899528db770dbd465eb239b809e73ed..c4890428cbdcd0d20b98b6441e173b3b9b0fe803 100644
|
| --- a/chrome/installer/test/resource_loader.h
|
| +++ b/chrome/installer/test/resource_loader.h
|
| @@ -8,11 +8,12 @@
|
| #define CHROME_INSTALLER_TEST_RESOURCE_LOADER_H_
|
|
|
| #include <windows.h>
|
| +#include <stdint.h>
|
|
|
| #include <string>
|
| #include <utility>
|
|
|
| -#include "base/basictypes.h"
|
| +#include "base/macros.h"
|
|
|
| namespace base {
|
| class FilePath;
|
| @@ -32,16 +33,20 @@ class ResourceLoader {
|
| // Places the address and size of the resource |name| of |type| into
|
| // |resource_data|, returning true on success. The address of the resource is
|
| // valid only until this instance is destroyed.
|
| - bool Load(const std::wstring& name, const std::wstring& type,
|
| - std::pair<const uint8*, DWORD>* resource_data);
|
| + bool Load(const std::wstring& name,
|
| + const std::wstring& type,
|
| + std::pair<const uint8_t*, DWORD>* resource_data);
|
|
|
| // Places the address and size of the resource |id| of |type| into
|
| // |resource_data|, returning true on success. The address of the resource is
|
| // valid only until this instance is destroyed.
|
| - bool Load(WORD id, WORD type, std::pair<const uint8*, DWORD>* resource_data);
|
| + bool Load(WORD id,
|
| + WORD type,
|
| + std::pair<const uint8_t*, DWORD>* resource_data);
|
|
|
| private:
|
| HMODULE module_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(ResourceLoader);
|
| }; // class ResourceLoader
|
|
|
|
|