| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
| 8 #include "chrome/browser/extensions/extension_apitest.h" | 8 #include "chrome/browser/extensions/extension_apitest.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/extensions/settings/settings_frontend.h" |
| 10 #include "chrome/browser/extensions/settings/settings_sync_util.h" | 11 #include "chrome/browser/extensions/settings/settings_sync_util.h" |
| 11 #include "chrome/browser/extensions/extension_test_message_listener.h" | 12 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/sync/api/sync_change.h" | 14 #include "chrome/browser/sync/api/sync_change.h" |
| 14 #include "chrome/browser/sync/api/sync_change_processor.h" | 15 #include "chrome/browser/sync/api/sync_change_processor.h" |
| 15 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
| 16 #include "chrome/common/chrome_switches.h" | 17 #include "chrome/common/chrome_switches.h" |
| 17 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
| 18 | 19 |
| 19 namespace extensions { | 20 namespace extensions { |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 SendChanges(sync_changes); | 230 SendChanges(sync_changes); |
| 230 | 231 |
| 231 FinalReplyWhenSatisfied( | 232 FinalReplyWhenSatisfied( |
| 232 "assertDeleteFooNotification", "assertDeleteFooNotification"); | 233 "assertDeleteFooNotification", "assertDeleteFooNotification"); |
| 233 | 234 |
| 234 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 235 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 235 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 236 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 236 } | 237 } |
| 237 | 238 |
| 238 } // namespace extensions | 239 } // namespace extensions |
| OLD | NEW |