| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "base/rand_util.h" | 5 #include "base/rand_util.h" |
| 6 #include "base/string16.h" | 6 #include "base/string16.h" |
| 7 #include "base/stringprintf.h" | 7 #include "base/stringprintf.h" |
| 8 #include "base/string_number_conversions.h" | 8 #include "base/string_number_conversions.h" |
| 9 #include "base/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/bookmarks/bookmark_utils.h" | 10 #include "chrome/browser/bookmarks/bookmark_utils.h" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 string url("http://www.nofaviconurl"); | 331 string url("http://www.nofaviconurl"); |
| 332 url.append(base::IntToString(index)); | 332 url.append(base::IntToString(index)); |
| 333 url.append(".com"); | 333 url.append(".com"); |
| 334 const BookmarkNode* nofavicon_bm = v->AddURL(bm0, | 334 const BookmarkNode* nofavicon_bm = v->AddURL(bm0, |
| 335 bm_folder, index, child_title, GURL(url)); | 335 bm_folder, index, child_title, GURL(url)); |
| 336 ASSERT_TRUE(nofavicon_bm != NULL); | 336 ASSERT_TRUE(nofavicon_bm != NULL); |
| 337 } | 337 } |
| 338 } | 338 } |
| 339 } | 339 } |
| 340 } | 340 } |
| 341 LOG(INFO) << "Adding several bookmarks under other bookmarks"; | 341 VLOG(1) << "Adding several bookmarks under other bookmarks"; |
| 342 for (int index = 0; index < 10; index++) { | 342 for (int index = 0; index < 10; index++) { |
| 343 wstring title(L"Other - TestBookmark"); | 343 wstring title(L"Other - TestBookmark"); |
| 344 title.append(IntToWStringHack(index)); | 344 title.append(IntToWStringHack(index)); |
| 345 string url("http://www.nofaviconurl-other"); | 345 string url("http://www.nofaviconurl-other"); |
| 346 url.append(base::IntToString(index)); | 346 url.append(base::IntToString(index)); |
| 347 url.append(".com"); | 347 url.append(".com"); |
| 348 const BookmarkNode* nofavicon_bm = | 348 const BookmarkNode* nofavicon_bm = |
| 349 v->AddURL(bm0, bm_other0, index, title, GURL(url)); | 349 v->AddURL(bm0, bm_other0, index, title, GURL(url)); |
| 350 ASSERT_TRUE(nofavicon_bm != NULL); | 350 ASSERT_TRUE(nofavicon_bm != NULL); |
| 351 } | 351 } |
| (...skipping 2100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2452 | 2452 |
| 2453 verifier->SetURL(profile0_bookmark_model, | 2453 verifier->SetURL(profile0_bookmark_model, |
| 2454 profile0_bookmark, | 2454 profile0_bookmark, |
| 2455 GURL("http://www.bookmark-url.com")); | 2455 GURL("http://www.bookmark-url.com")); |
| 2456 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 2456 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
| 2457 BookmarkModelVerifier::VerifyNoDuplicates(profile0_bookmark_model); | 2457 BookmarkModelVerifier::VerifyNoDuplicates(profile0_bookmark_model); |
| 2458 verifier->ExpectMatch(profile0_bookmark_model); | 2458 verifier->ExpectMatch(profile0_bookmark_model); |
| 2459 verifier->ExpectMatch(profile1_bookmark_model); | 2459 verifier->ExpectMatch(profile1_bookmark_model); |
| 2460 } | 2460 } |
| 2461 | 2461 |
| OLD | NEW |