| 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 "base/stringprintf.h" | 5 #include "base/stringprintf.h" |
| 6 #include "base/utf_string_conversions.h" |
| 6 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
| 7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
| 8 #include "chrome/browser/sync/test/integration/sync_test.h" | 9 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 9 | 10 |
| 10 using bookmarks_helper::AddURL; | 11 using bookmarks_helper::AddURL; |
| 11 using bookmarks_helper::AllModelsMatch; | 12 using bookmarks_helper::AllModelsMatch; |
| 12 | 13 |
| 13 class MultipleClientBookmarksSyncTest : public SyncTest { | 14 class MultipleClientBookmarksSyncTest : public SyncTest { |
| 14 public: | 15 public: |
| 15 MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {} | 16 MultipleClientBookmarksSyncTest() : SyncTest(MULTIPLE_CLIENT) {} |
| 16 virtual ~MultipleClientBookmarksSyncTest() {} | 17 virtual ~MultipleClientBookmarksSyncTest() {} |
| 17 | 18 |
| 18 private: | 19 private: |
| 19 DISALLOW_COPY_AND_ASSIGN(MultipleClientBookmarksSyncTest); | 20 DISALLOW_COPY_AND_ASSIGN(MultipleClientBookmarksSyncTest); |
| 20 }; | 21 }; |
| 21 | 22 |
| 22 IN_PROC_BROWSER_TEST_F(MultipleClientBookmarksSyncTest, Sanity) { | 23 IN_PROC_BROWSER_TEST_F(MultipleClientBookmarksSyncTest, Sanity) { |
| 23 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 24 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 24 DisableVerifier(); | 25 DisableVerifier(); |
| 25 for (int i = 0; i < num_clients(); ++i) { | 26 for (int i = 0; i < num_clients(); ++i) { |
| 26 ASSERT_TRUE(AddURL(i, base::StringPrintf(L"Google URL %d", i), | 27 ASSERT_TRUE(AddURL(i, ASCIIToWide(base::StringPrintf("Google URL %d", i)), |
| 27 GURL(StringPrintf("http://www.google.com/%d", i))) != NULL); | 28 GURL(StringPrintf("http://www.google.com/%d", i))) != NULL); |
| 28 } | 29 } |
| 29 ASSERT_TRUE(AwaitQuiescence()); | 30 ASSERT_TRUE(AwaitQuiescence()); |
| 30 ASSERT_TRUE(AllModelsMatch()); | 31 ASSERT_TRUE(AllModelsMatch()); |
| 31 } | 32 } |
| OLD | NEW |