diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/sync/notifier/non_blocking_invalidator_unittest.cc | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
| download | qtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/sync/notifier/non_blocking_invalidator_unittest.cc')
| -rw-r--r-- | chromium/sync/notifier/non_blocking_invalidator_unittest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chromium/sync/notifier/non_blocking_invalidator_unittest.cc b/chromium/sync/notifier/non_blocking_invalidator_unittest.cc index f463077c088..0c439c502c6 100644 --- a/chromium/sync/notifier/non_blocking_invalidator_unittest.cc +++ b/chromium/sync/notifier/non_blocking_invalidator_unittest.cc @@ -17,7 +17,6 @@ #include "sync/notifier/fake_invalidation_handler.h" #include "sync/notifier/invalidation_state_tracker.h" #include "sync/notifier/invalidator_test_template.h" -#include "sync/notifier/object_id_invalidation_map_test_util.h" #include "testing/gtest/include/gtest/gtest.h" namespace syncer { @@ -49,7 +48,7 @@ class NonBlockingInvalidatorTestDelegate { new NonBlockingInvalidator( invalidator_options, invalidator_client_id, - InvalidationStateMap(), + UnackedInvalidationsMap(), initial_state, MakeWeakHandle(invalidation_state_tracker), "fake_client_info")); |