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
Upstream version 10.39.225.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
base
/
models
/
tree_node_iterator_unittest.cc
diff --git
a/src/ui/base/models/tree_node_iterator_unittest.cc
b/src/ui/base/models/tree_node_iterator_unittest.cc
index
263f8d4
..
4acf89c
100644
(file)
--- a/
src/ui/base/models/tree_node_iterator_unittest.cc
+++ b/
src/ui/base/models/tree_node_iterator_unittest.cc
@@
-4,6
+4,7
@@
#include "ui/base/models/tree_node_iterator.h"
#include "ui/base/models/tree_node_iterator.h"
+#include "base/bind.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/models/tree_node_model.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/base/models/tree_node_model.h"
@@
-66,12
+67,12
@@
TEST(TreeNodeIteratorTest, Prune) {
f4->Add(new TestNode(5), 0);
f3->Add(new TestNode(7), 1);
f4->Add(new TestNode(5), 0);
f3->Add(new TestNode(7), 1);
- TreeNodeIterator<TestNode> odd_iterator(&root,
PruneOdd
);
+ TreeNodeIterator<TestNode> odd_iterator(&root,
base::Bind(&PruneOdd)
);
ASSERT_TRUE(odd_iterator.has_next());
ASSERT_EQ(2, odd_iterator.Next()->value);
ASSERT_FALSE(odd_iterator.has_next());
ASSERT_TRUE(odd_iterator.has_next());
ASSERT_EQ(2, odd_iterator.Next()->value);
ASSERT_FALSE(odd_iterator.has_next());
- TreeNodeIterator<TestNode> even_iterator(&root,
PruneEven
);
+ TreeNodeIterator<TestNode> even_iterator(&root,
base::Bind(&PruneEven)
);
ASSERT_TRUE(even_iterator.has_next());
ASSERT_EQ(1, even_iterator.Next()->value);
ASSERT_TRUE(even_iterator.has_next());
ASSERT_TRUE(even_iterator.has_next());
ASSERT_EQ(1, even_iterator.Next()->value);
ASSERT_TRUE(even_iterator.has_next());