| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/rand_util.h" | 7 #include "base/rand_util.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 399 LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to " | 399 LOG(ERROR) << "Node " << node->GetTitle() << " does not belong to " |
| 400 << "Profile " << profile; | 400 << "Profile " << profile; |
| 401 return NULL; | 401 return NULL; |
| 402 } | 402 } |
| 403 if (test()->use_verifier()) { | 403 if (test()->use_verifier()) { |
| 404 const BookmarkNode* v_node = NULL; | 404 const BookmarkNode* v_node = NULL; |
| 405 FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); | 405 FindNodeInVerifier(GetBookmarkModel(profile), node, &v_node); |
| 406 bookmark_utils::ApplyEditsWithNoFolderChange( | 406 bookmark_utils::ApplyEditsWithNoFolderChange( |
| 407 GetVerifierBookmarkModel(), | 407 GetVerifierBookmarkModel(), |
| 408 v_node->parent(), | 408 v_node->parent(), |
| 409 BookmarkEditor::EditDetails(v_node), | 409 BookmarkEditor::EditDetails::EditNode(v_node), |
| 410 v_node->GetTitle(), | 410 v_node->GetTitle(), |
| 411 new_url); | 411 new_url); |
| 412 } | 412 } |
| 413 return bookmark_utils::ApplyEditsWithNoFolderChange( | 413 return bookmark_utils::ApplyEditsWithNoFolderChange( |
| 414 GetBookmarkModel(profile), | 414 GetBookmarkModel(profile), |
| 415 node->parent(), | 415 node->parent(), |
| 416 BookmarkEditor::EditDetails(node), | 416 BookmarkEditor::EditDetails::EditNode(node), |
| 417 node->GetTitle(), | 417 node->GetTitle(), |
| 418 new_url); | 418 new_url); |
| 419 } | 419 } |
| 420 | 420 |
| 421 void Move(int profile, | 421 void Move(int profile, |
| 422 const BookmarkNode* node, | 422 const BookmarkNode* node, |
| 423 const BookmarkNode* new_parent, | 423 const BookmarkNode* new_parent, |
| 424 int index) { | 424 int index) { |
| 425 ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node) | 425 ASSERT_EQ(GetBookmarkModel(profile)->GetNodeByID(node->id()), node) |
| 426 << "Node " << node->GetTitle() << " does not belong to " | 426 << "Node " << node->GetTitle() << " does not belong to " |
| (...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 584 | 584 |
| 585 std::wstring IndexedSubfolderName(int i) { | 585 std::wstring IndexedSubfolderName(int i) { |
| 586 return StringPrintf(L"Subfolder Name %d", i); | 586 return StringPrintf(L"Subfolder Name %d", i); |
| 587 } | 587 } |
| 588 | 588 |
| 589 std::wstring IndexedSubsubfolderName(int i) { | 589 std::wstring IndexedSubsubfolderName(int i) { |
| 590 return StringPrintf(L"Subsubfolder Name %d", i); | 590 return StringPrintf(L"Subsubfolder Name %d", i); |
| 591 } | 591 } |
| 592 | 592 |
| 593 } // namespace bookmarks_helper | 593 } // namespace bookmarks_helper |
| OLD | NEW |