diff options
| author | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 12:41:07 +0000 |
|---|---|---|
| committer | droger@chromium.org <droger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-08 12:41:07 +0000 |
| commit | 8b3155aee158aaecc284d91bf877c7762fa98873 (patch) | |
| tree | efb547d0cc9c2352cc25e7171e67a6d477d727e3 /net | |
| parent | 556bc134977f65d19b3d984d005fc008d82a7f8d (diff) | |
| download | chromium_src-8b3155aee158aaecc284d91bf877c7762fa98873.zip chromium_src-8b3155aee158aaecc284d91bf877c7762fa98873.tar.gz chromium_src-8b3155aee158aaecc284d91bf877c7762fa98873.tar.bz2 | |
Fix a compilation issue in cookie_store_unittest.h
Some platforms cannot compare pointers of different types, and need a cast.
BUG=NONE
TEST=NONE
Review URL: https://chromiumcodereview.appspot.com/9347024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120967 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/cookie_store_unittest.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/base/cookie_store_unittest.h b/net/base/cookie_store_unittest.h index d43ff91..fb0bbf4 100644 --- a/net/base/cookie_store_unittest.h +++ b/net/base/cookie_store_unittest.h @@ -11,6 +11,7 @@ #include "base/string_tokenizer.h" #include "base/threading/thread.h" #include "googleurl/src/gurl.h" +#include "net/base/cookie_monster.h" #include "net/base/cookie_store.h" #include "net/base/cookie_store_test_callbacks.h" #include "testing/gtest/include/gtest/gtest.h" @@ -236,7 +237,8 @@ TYPED_TEST_CASE_P(CookieStoreTest); TYPED_TEST_P(CookieStoreTest, TypeTest) { scoped_refptr<CookieStore> cs(this->GetCookieStore()); EXPECT_EQ(cs->GetCookieMonster(), - (TypeParam::is_cookie_monster) ? cs.get() : NULL); + (TypeParam::is_cookie_monster) ? + static_cast<CookieMonster*>(cs.get()) : NULL); } TYPED_TEST_P(CookieStoreTest, DomainTest) { |