diff options
author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 05:15:11 +0000 |
---|---|---|
committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-31 05:15:11 +0000 |
commit | 34694763d71c8d8306a17a7762eeb89db59adba6 (patch) | |
tree | 406d01e5e576b22c28721a77aff4b5f4d0c7b739 /ui/gfx/codec/png_codec_unittest.cc | |
parent | ebee45cb2ff9b8eda19a02f2474e6d4e2331fd30 (diff) | |
download | chromium_src-34694763d71c8d8306a17a7762eeb89db59adba6.zip chromium_src-34694763d71c8d8306a17a7762eeb89db59adba6.tar.gz chromium_src-34694763d71c8d8306a17a7762eeb89db59adba6.tar.bz2 |
Android fixes for gfx_unittests.
With https://chromiumcodereview.appspot.com/9264014/ patched in we get
to the link stage.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/9302020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119856 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gfx/codec/png_codec_unittest.cc')
-rw-r--r-- | ui/gfx/codec/png_codec_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/gfx/codec/png_codec_unittest.cc b/ui/gfx/codec/png_codec_unittest.cc index 16ca34a..e737cd2 100644 --- a/ui/gfx/codec/png_codec_unittest.cc +++ b/ui/gfx/codec/png_codec_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -329,14 +329,14 @@ TEST(PNGCodec, EncodeWithComment) { const unsigned char kExpected3[] = "\x00\x00\x00\x18tEXthave some\x00spaces in both\x8d\x69\x34\x2d"; - EXPECT_NE(search(encoded.begin(), encoded.end(), kExpected1, - kExpected1 + arraysize(kExpected1)), + EXPECT_NE(std::search(encoded.begin(), encoded.end(), kExpected1, + kExpected1 + arraysize(kExpected1)), encoded.end()); - EXPECT_NE(search(encoded.begin(), encoded.end(), kExpected2, - kExpected2 + arraysize(kExpected2)), + EXPECT_NE(std::search(encoded.begin(), encoded.end(), kExpected2, + kExpected2 + arraysize(kExpected2)), encoded.end()); - EXPECT_NE(search(encoded.begin(), encoded.end(), kExpected3, - kExpected3 + arraysize(kExpected3)), + EXPECT_NE(std::search(encoded.begin(), encoded.end(), kExpected3, + kExpected3 + arraysize(kExpected3)), encoded.end()); } |