| 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 #ifdef CHROME_PERSONALIZATION | 5 #ifdef CHROME_PERSONALIZATION | 
|  | 6 #ifndef COMPILING_SYNCAPI_STUB  // This test requires the real deal syncapi. | 
| 6 | 7 | 
| 7 #include <stack> | 8 #include <stack> | 
| 8 #include <vector> | 9 #include <vector> | 
| 9 | 10 | 
| 10 #include "testing/gtest/include/gtest/gtest.h" | 11 #include "testing/gtest/include/gtest/gtest.h" | 
| 11 | 12 | 
| 12 #include "base/command_line.h" | 13 #include "base/command_line.h" | 
| 13 #include "base/string_util.h" | 14 #include "base/string_util.h" | 
| 14 #include "base/string16.h" | 15 #include "base/string16.h" | 
| 15 #include "chrome/browser/bookmarks/bookmark_model.h" | 16 #include "chrome/browser/bookmarks/bookmark_model.h" | 
| (...skipping 1247 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1263   // Restart the sync service. | 1264   // Restart the sync service. | 
| 1264   StartSyncService(); | 1265   StartSyncService(); | 
| 1265 | 1266 | 
| 1266   // Make sure we're back in sync.  In real life, the user would need | 1267   // Make sure we're back in sync.  In real life, the user would need | 
| 1267   // to reauthenticate before this happens, but in the test, authentication | 1268   // to reauthenticate before this happens, but in the test, authentication | 
| 1268   // is sidestepped. | 1269   // is sidestepped. | 
| 1269   ExpectBookmarkModelMatchesTestData(); | 1270   ExpectBookmarkModelMatchesTestData(); | 
| 1270   ExpectModelMatch(); | 1271   ExpectModelMatch(); | 
| 1271 } | 1272 } | 
| 1272 | 1273 | 
|  | 1274 #endif  // COMPILING_SYNCAPI_STUB | 
| 1273 #endif  // CHROME_PERSONALIZATION | 1275 #endif  // CHROME_PERSONALIZATION | 
| OLD | NEW | 
|---|