projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update To 11.40.268.0
[platform/framework/web/crosswalk.git]
/
src
/
sync
/
engine
/
get_updates_processor_unittest.cc
diff --git
a/src/sync/engine/get_updates_processor_unittest.cc
b/src/sync/engine/get_updates_processor_unittest.cc
index
a09ab4e
..
c146c56
100644
(file)
--- a/
src/sync/engine/get_updates_processor_unittest.cc
+++ b/
src/sync/engine/get_updates_processor_unittest.cc
@@
-26,8
+26,7
@@
namespace {
scoped_ptr<InvalidationInterface> BuildInvalidation(
int64 version,
const std::string& payload) {
scoped_ptr<InvalidationInterface> BuildInvalidation(
int64 version,
const std::string& payload) {
- return MockInvalidation::Build(version, payload)
- .PassAs<InvalidationInterface>();
+ return MockInvalidation::Build(version, payload);
}
} // namespace
}
} // namespace
@@
-389,7
+388,7
@@
class GetUpdatesProcessorApplyUpdatesTest : public GetUpdatesProcessorTest {
GetUpdatesProcessorApplyUpdatesTest() {}
virtual ~GetUpdatesProcessorApplyUpdatesTest() {}
GetUpdatesProcessorApplyUpdatesTest() {}
virtual ~GetUpdatesProcessorApplyUpdatesTest() {}
- virtual void SetUp()
OVERRIDE
{
+ virtual void SetUp()
override
{
bookmarks_handler_ = AddUpdateHandler(BOOKMARKS);
autofill_handler_ = AddUpdateHandler(AUTOFILL);
}
bookmarks_handler_ = AddUpdateHandler(BOOKMARKS);
autofill_handler_ = AddUpdateHandler(AUTOFILL);
}