| OLD | NEW |
| 1 // Copyright 2017 The Chromium Authors. All rights reserved. | 1 // Copyright 2017 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "chrome/browser/sync/test/integration/printers_helper.h" | 8 #include "chrome/browser/sync/test/integration/printers_helper.h" |
| 9 #include "chrome/browser/sync/test/integration/sync_test.h" | 9 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 10 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" | 10 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h
" |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 72 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 73 | 73 |
| 74 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); | 74 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); |
| 75 EXPECT_EQ(1, GetPrinterCount(0)); | 75 EXPECT_EQ(1, GetPrinterCount(0)); |
| 76 | 76 |
| 77 RemovePrinter(GetPrinterStore(0), 0); | 77 RemovePrinter(GetPrinterStore(0), 0); |
| 78 EXPECT_EQ(0, GetPrinterCount(0)); | 78 EXPECT_EQ(0, GetPrinterCount(0)); |
| 79 } | 79 } |
| 80 | 80 |
| 81 // Verify that merging data added before sync works. | 81 // Verify that merging data added before sync works. |
| 82 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, AddBeforeSetup) { | 82 // crbug.com/689662 |
| 83 #if defined(OS_CHROMEOS) |
| 84 #define MAYBE_AddBeforeSetup DISABLED_AddBeforeSetup |
| 85 #else |
| 86 #define MAYBE_AddBeforeSetup AddBeforeSetup |
| 87 #endif |
| 88 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_AddBeforeSetup) { |
| 83 ASSERT_TRUE(SetupClients()); | 89 ASSERT_TRUE(SetupClients()); |
| 84 | 90 |
| 85 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); | 91 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); |
| 86 EXPECT_EQ(1, GetPrinterCount(0)); | 92 EXPECT_EQ(1, GetPrinterCount(0)); |
| 87 | 93 |
| 88 EXPECT_TRUE(SetupSync()) << "SetupSync() failed."; | 94 EXPECT_TRUE(SetupSync()) << "SetupSync() failed."; |
| 89 } | 95 } |
| OLD | NEW |