| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/extension_test_message_listener.h" | 10 #include "chrome/browser/extensions/extension_test_message_listener.h" |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 | 24 |
| 25 using settings_namespace::FromString; | 25 using settings_namespace::FromString; |
| 26 using settings_namespace::LOCAL; | 26 using settings_namespace::LOCAL; |
| 27 using settings_namespace::Namespace; | 27 using settings_namespace::Namespace; |
| 28 using settings_namespace::SYNC; | 28 using settings_namespace::SYNC; |
| 29 using settings_namespace::ToString; | 29 using settings_namespace::ToString; |
| 30 | 30 |
| 31 namespace { | 31 namespace { |
| 32 | 32 |
| 33 // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS. | 33 // TODO(kalman): test both EXTENSION_SETTINGS and APP_SETTINGS. |
| 34 const syncable::ModelType kModelType = syncable::EXTENSION_SETTINGS; | 34 const syncer::ModelType kModelType = syncer::EXTENSION_SETTINGS; |
| 35 | 35 |
| 36 class NoopSyncChangeProcessor : public syncer::SyncChangeProcessor { | 36 class NoopSyncChangeProcessor : public syncer::SyncChangeProcessor { |
| 37 public: | 37 public: |
| 38 virtual syncer::SyncError ProcessSyncChanges( | 38 virtual syncer::SyncError ProcessSyncChanges( |
| 39 const tracked_objects::Location& from_here, | 39 const tracked_objects::Location& from_here, |
| 40 const syncer::SyncChangeList& change_list) OVERRIDE { | 40 const syncer::SyncChangeList& change_list) OVERRIDE { |
| 41 return syncer::SyncError(); | 41 return syncer::SyncError(); |
| 42 } | 42 } |
| 43 | 43 |
| 44 virtual ~NoopSyncChangeProcessor() {}; | 44 virtual ~NoopSyncChangeProcessor() {}; |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 SendChanges(sync_changes); | 378 SendChanges(sync_changes); |
| 379 | 379 |
| 380 FinalReplyWhenSatisfied(LOCAL, | 380 FinalReplyWhenSatisfied(LOCAL, |
| 381 "assertNoNotifications", "assertNoNotifications"); | 381 "assertNoNotifications", "assertNoNotifications"); |
| 382 | 382 |
| 383 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); | 383 EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
| 384 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); | 384 EXPECT_TRUE(catcher_incognito.GetNextResult()) << catcher.message(); |
| 385 } | 385 } |
| 386 | 386 |
| 387 } // namespace extensions | 387 } // namespace extensions |
| OLD | NEW |