| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 #if defined(BROWSER_SYNC) | |
| 6 | |
| 7 #include <stack> | 5 #include <stack> |
| 8 #include <vector> | 6 #include <vector> |
| 9 | 7 |
| 10 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 11 | 9 |
| 12 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| 13 #include "base/string_util.h" | 11 #include "base/string_util.h" |
| 14 #include "base/string16.h" | 12 #include "base/string16.h" |
| 15 #include "chrome/browser/bookmarks/bookmark_model.h" | 13 #include "chrome/browser/bookmarks/bookmark_model.h" |
| 16 #include "chrome/browser/profile.h" | 14 #include "chrome/browser/profile.h" |
| (...skipping 1258 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1275 | 1273 |
| 1276 // Restart the sync service. | 1274 // Restart the sync service. |
| 1277 StartSyncService(); | 1275 StartSyncService(); |
| 1278 | 1276 |
| 1279 // Make sure we're back in sync. In real life, the user would need | 1277 // Make sure we're back in sync. In real life, the user would need |
| 1280 // to reauthenticate before this happens, but in the test, authentication | 1278 // to reauthenticate before this happens, but in the test, authentication |
| 1281 // is sidestepped. | 1279 // is sidestepped. |
| 1282 ExpectBookmarkModelMatchesTestData(); | 1280 ExpectBookmarkModelMatchesTestData(); |
| 1283 ExpectModelMatch(); | 1281 ExpectModelMatch(); |
| 1284 } | 1282 } |
| 1285 | |
| 1286 #endif // defined(BROWSER_SYNC) | |
| OLD | NEW |