| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "components/bookmarks/test/bookmark_test_helpers.h" | 5 #include "components/bookmarks/test/bookmark_test_helpers.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/callback.h" | 8 #include "base/callback.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
| 12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
| 13 #include "components/bookmarks/browser/base_bookmark_model_observer.h" | 13 #include "components/bookmarks/browser/base_bookmark_model_observer.h" |
| 14 #include "components/bookmarks/browser/bookmark_model.h" | 14 #include "components/bookmarks/browser/bookmark_model.h" |
| 15 #include "url/gurl.h" | 15 #include "url/gurl.h" |
| 16 | 16 |
| 17 namespace { | 17 namespace { |
| 18 | 18 |
| 19 // BookmarkLoadObserver is used when blocking until the BookmarkModel finishes | 19 // BookmarkLoadObserver is used when blocking until the BookmarkModel finishes |
| 20 // loading. As soon as the BookmarkModel finishes loading the message loop is | 20 // loading. As soon as the BookmarkModel finishes loading the message loop is |
| 21 // quit. | 21 // quit. |
| 22 class BookmarkLoadObserver : public BaseBookmarkModelObserver { | 22 class BookmarkLoadObserver : public BaseBookmarkModelObserver { |
| 23 public: | 23 public: |
| 24 explicit BookmarkLoadObserver(const base::Closure& quit_task); | 24 explicit BookmarkLoadObserver(const base::Closure& quit_task); |
| 25 virtual ~BookmarkLoadObserver(); | 25 virtual ~BookmarkLoadObserver(); |
| 26 | 26 |
| 27 private: | 27 private: |
| 28 // BaseBookmarkModelObserver: | 28 // BaseBookmarkModelObserver: |
| 29 virtual void BookmarkModelChanged() OVERRIDE; | 29 virtual void BookmarkModelChanged() override; |
| 30 virtual void BookmarkModelLoaded(BookmarkModel* model, | 30 virtual void BookmarkModelLoaded(BookmarkModel* model, |
| 31 bool ids_reassigned) OVERRIDE; | 31 bool ids_reassigned) override; |
| 32 | 32 |
| 33 base::Closure quit_task_; | 33 base::Closure quit_task_; |
| 34 | 34 |
| 35 DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver); | 35 DISALLOW_COPY_AND_ASSIGN(BookmarkLoadObserver); |
| 36 }; | 36 }; |
| 37 | 37 |
| 38 BookmarkLoadObserver::BookmarkLoadObserver(const base::Closure& quit_task) | 38 BookmarkLoadObserver::BookmarkLoadObserver(const base::Closure& quit_task) |
| 39 : quit_task_(quit_task) {} | 39 : quit_task_(quit_task) {} |
| 40 | 40 |
| 41 BookmarkLoadObserver::~BookmarkLoadObserver() {} | 41 BookmarkLoadObserver::~BookmarkLoadObserver() {} |
| (...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 130 const BookmarkNode* node, | 130 const BookmarkNode* node, |
| 131 const std::string& model_string) { | 131 const std::string& model_string) { |
| 132 DCHECK(node); | 132 DCHECK(node); |
| 133 std::string::size_type start_pos = 0; | 133 std::string::size_type start_pos = 0; |
| 134 std::string::size_type end_pos = | 134 std::string::size_type end_pos = |
| 135 AddNodesFromString(model, node, model_string, start_pos); | 135 AddNodesFromString(model, node, model_string, start_pos); |
| 136 DCHECK(end_pos == std::string::npos); | 136 DCHECK(end_pos == std::string::npos); |
| 137 } | 137 } |
| 138 | 138 |
| 139 } // namespace test | 139 } // namespace test |
| OLD | NEW |