OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "chrome/browser/sync/test/integration/bookmarks_helper.h" | 5 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
6 | 6 |
7 #include "base/compiler_specific.h" | 7 #include "base/compiler_specific.h" |
8 #include "base/rand_util.h" | 8 #include "base/rand_util.h" |
9 #include "base/string_number_conversions.h" | 9 #include "base/string_number_conversions.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 24 matching lines...) Expand all Loading... |
35 : model_(model), | 35 : model_(model), |
36 node_(node), | 36 node_(node), |
37 wait_for_load_(false) { | 37 wait_for_load_(false) { |
38 model->AddObserver(this); | 38 model->AddObserver(this); |
39 } | 39 } |
40 virtual ~FaviconChangeObserver() { | 40 virtual ~FaviconChangeObserver() { |
41 model_->RemoveObserver(this); | 41 model_->RemoveObserver(this); |
42 } | 42 } |
43 void WaitForGetFavicon() { | 43 void WaitForGetFavicon() { |
44 wait_for_load_ = true; | 44 wait_for_load_ = true; |
45 ui_test_utils::RunMessageLoop(); | 45 content::RunMessageLoop(); |
46 ASSERT_TRUE(node_->is_favicon_loaded()); | 46 ASSERT_TRUE(node_->is_favicon_loaded()); |
47 } | 47 } |
48 void WaitForSetFavicon() { | 48 void WaitForSetFavicon() { |
49 wait_for_load_ = false; | 49 wait_for_load_ = false; |
50 ui_test_utils::RunMessageLoop(); | 50 content::RunMessageLoop(); |
51 } | 51 } |
52 virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {} | 52 virtual void Loaded(BookmarkModel* model, bool ids_reassigned) OVERRIDE {} |
53 virtual void BookmarkNodeMoved(BookmarkModel* model, | 53 virtual void BookmarkNodeMoved(BookmarkModel* model, |
54 const BookmarkNode* old_parent, | 54 const BookmarkNode* old_parent, |
55 int old_index, | 55 int old_index, |
56 const BookmarkNode* new_parent, | 56 const BookmarkNode* new_parent, |
57 int new_index) OVERRIDE {} | 57 int new_index) OVERRIDE {} |
58 virtual void BookmarkNodeAdded(BookmarkModel* model, | 58 virtual void BookmarkNodeAdded(BookmarkModel* model, |
59 const BookmarkNode* parent, | 59 const BookmarkNode* parent, |
60 int index) OVERRIDE {} | 60 int index) OVERRIDE {} |
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
599 | 599 |
600 std::wstring IndexedSubfolderName(int i) { | 600 std::wstring IndexedSubfolderName(int i) { |
601 return StringPrintf(L"Subfolder Name %d", i); | 601 return StringPrintf(L"Subfolder Name %d", i); |
602 } | 602 } |
603 | 603 |
604 std::wstring IndexedSubsubfolderName(int i) { | 604 std::wstring IndexedSubsubfolderName(int i) { |
605 return StringPrintf(L"Subsubfolder Name %d", i); | 605 return StringPrintf(L"Subsubfolder Name %d", i); |
606 } | 606 } |
607 | 607 |
608 } // namespace bookmarks_helper | 608 } // namespace bookmarks_helper |
OLD | NEW |