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
/
components
/
bookmarks
/
browser
/
bookmark_node_data_unittest.cc
diff --git
a/src/components/bookmarks/browser/bookmark_node_data_unittest.cc
b/src/components/bookmarks/browser/bookmark_node_data_unittest.cc
index
9a0ecd7
..
4e93fa2
100644
(file)
--- a/
src/components/bookmarks/browser/bookmark_node_data_unittest.cc
+++ b/
src/components/bookmarks/browser/bookmark_node_data_unittest.cc
@@
-26,7
+26,7
@@
class BookmarkNodeDataTest : public testing::Test {
virtual void SetUp() OVERRIDE {
event_source_ = ui::PlatformEventSource::CreateDefault();
virtual void SetUp() OVERRIDE {
event_source_ = ui::PlatformEventSource::CreateDefault();
- model_ = client_.CreateModel(
false
);
+ model_ = client_.CreateModel();
test::WaitForBookmarkModelToLoad(model_.get());
bool success = profile_dir_.CreateUniqueTempDir();
ASSERT_TRUE(success);
test::WaitForBookmarkModelToLoad(model_.get());
bool success = profile_dir_.CreateUniqueTempDir();
ASSERT_TRUE(success);
@@
-45,7
+45,7
@@
class BookmarkNodeDataTest : public testing::Test {
private:
base::ScopedTempDir profile_dir_;
private:
base::ScopedTempDir profile_dir_;
-
test::
TestBookmarkClient client_;
+ TestBookmarkClient client_;
scoped_ptr<BookmarkModel> model_;
scoped_ptr<ui::PlatformEventSource> event_source_;
scoped_ptr<BookmarkModel> model_;
scoped_ptr<ui::PlatformEventSource> event_source_;