diff options
| author | thakis <thakis@chromium.org> | 2016-01-26 08:03:12 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-26 16:04:09 +0000 |
| commit | 80a9d9b6ec09e3565f3a509bf0dde3509e61e451 (patch) | |
| tree | ada1d3e5c5fc2b8456c5d2da938a860b814cd39a | |
| parent | 015b5b5829406934f9863c73f931815ae5007e8f (diff) | |
| download | chromium_src-80a9d9b6ec09e3565f3a509bf0dde3509e61e451.zip chromium_src-80a9d9b6ec09e3565f3a509bf0dde3509e61e451.tar.gz chromium_src-80a9d9b6ec09e3565f3a509bf0dde3509e61e451.tar.bz2 | |
clang/win: Fix -Wsign-compare warning after https://codereview.chromium.org/1631903002
Also turn on chromium_code for these targets in gyp. This makes warnings
for these targets consistent between gyp and gn.
BUG=550983, 581133, 82385
TBR=grt@chromium.org
Review URL: https://codereview.chromium.org/1637793003
Cr-Commit-Position: refs/heads/master@{#371520}
| -rw-r--r-- | chrome/installer/test/alternate_version_generator.cc | 4 | ||||
| -rw-r--r-- | chrome/installer/upgrade_test.gyp | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/installer/test/alternate_version_generator.cc b/chrome/installer/test/alternate_version_generator.cc index c0ec333..211b1e5 100644 --- a/chrome/installer/test/alternate_version_generator.cc +++ b/chrome/installer/test/alternate_version_generator.cc @@ -425,8 +425,8 @@ bool UpdateManifestVersion(const base::FilePath& manifest, return false; } DCHECK(modified); - return base::WriteFile(manifest, &contents[0], contents.size()) == - contents.size(); + int written = base::WriteFile(manifest, &contents[0], contents.size()); + return written != -1 && static_cast<size_t>(written) == contents.size(); } bool IncrementNewVersion(upgrade_test::Direction direction, diff --git a/chrome/installer/upgrade_test.gyp b/chrome/installer/upgrade_test.gyp index 07b283e..1a05535 100644 --- a/chrome/installer/upgrade_test.gyp +++ b/chrome/installer/upgrade_test.gyp @@ -4,6 +4,7 @@ { 'variables': { + 'chromium_code': 1, 'branding_dir': '../app/theme/<(branding_path_component)', 'version_py': '<(DEPTH)/build/util/version.py', 'version_path': '../../chrome/VERSION', |