diff options
| author | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:57:07 +0000 |
|---|---|---|
| committer | skrul@chromium.org <skrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-27 17:57:07 +0000 |
| commit | 5276adda50be7242b4b8bf6bf08a5643a5706014 (patch) | |
| tree | 6fc8030d550529a6d75bce280f19a38c9e916ca5 /chrome/browser/sync | |
| parent | e4eca3bfe559df7371abaa922b171182f913e23e (diff) | |
| download | chromium_src-5276adda50be7242b4b8bf6bf08a5643a5706014.zip chromium_src-5276adda50be7242b4b8bf6bf08a5643a5706014.tar.gz chromium_src-5276adda50be7242b4b8bf6bf08a5643a5706014.tar.bz2 | |
Enable valgrind for sync tests (and fix valgrind errors)
BUG=32871
Review URL: http://codereview.chromium.org/548156
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@37262 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
| -rw-r--r-- | chrome/browser/sync/engine/net/gaia_authenticator.h | 8 | ||||
| -rwxr-xr-x | chrome/browser/sync/engine/syncer_unittest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/sync/sessions/sync_session_unittest.cc | 1 |
3 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/net/gaia_authenticator.h b/chrome/browser/sync/engine/net/gaia_authenticator.h index 55e2745..32f06de 100644 --- a/chrome/browser/sync/engine/net/gaia_authenticator.h +++ b/chrome/browser/sync/engine/net/gaia_authenticator.h @@ -158,8 +158,14 @@ class GaiaAuthenticator { std::string captcha_url; SignIn signin; + // TODO(skrul): When auth fails, the "signin" field of the results + // struct never gets set, which causes valgrind to complain. Give + // this field a value here so the error is suppressed. It turns + // out that the signin field has only one possible value, so the + // correct fix here would be to to remove it entirely. AuthResults() : credentials_saved(DONT_SAVE_CREDENTIALS), - auth_error(None) { } + auth_error(None), + signin(GMAIL_SIGNIN) { } }; protected: diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index b9729eb..7d2aa38 100755 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -3054,6 +3054,7 @@ TEST_F(SusanDeletingTest, EXPECT_TRUE(joe.Get(IS_UNSYNCED)); } EXPECT_TRUE(0 == countdown_till_delete_); + delete syncer_->pre_conflict_resolution_closure_; syncer_->pre_conflict_resolution_closure_ = NULL; LoopSyncShare(syncer_); LoopSyncShare(syncer_); diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc index 5ac602d..8c9cfe3 100644 --- a/chrome/browser/sync/sessions/sync_session_unittest.cc +++ b/chrome/browser/sync/sessions/sync_session_unittest.cc @@ -77,6 +77,7 @@ TEST_F(SyncSessionTest, ScopedContextHelpers) { } EXPECT_FALSE(context_->resolver()); EXPECT_FALSE(context_->syncer_event_channel()); + delete channel; } TEST_F(SyncSessionTest, SetWriteTransaction) { |