diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:39:55 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-02 18:39:55 +0000 |
| commit | fa1348784a1eef04761ddf690d0fed740587d346 (patch) | |
| tree | aa769db4f16fbafbc057897e1cb7b19c47db6784 /chrome/browser/sync/profile_sync_service_mock.h | |
| parent | 7b3cb4b2b70c3b03e9a2ad2e7215894f0c8d8b36 (diff) | |
| download | chromium_src-fa1348784a1eef04761ddf690d0fed740587d346.zip chromium_src-fa1348784a1eef04761ddf690d0fed740587d346.tar.gz chromium_src-fa1348784a1eef04761ddf690d0fed740587d346.tar.bz2 | |
[Sync] Rewrote about:sync backend to use WeakHandles
This simplifies the handling of JS messages, replies, and events.
Made ProcessJsMessage take a WeakHandle to a JsReplyHandler instead of
having a JsEventRouter class (which is now removed).
Add JsBackend parameter to OnInitializationComplete().
Renamed JsFrontend to JsController.
Renamed JsEventHandlerList to SyncJsController.
Handle events that happen before sync is initialized.
Made about:sync work in incognito mode.
BUG=90942,76809
TEST=
Review URL: http://codereview.chromium.org/7518014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/profile_sync_service_mock.h')
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_mock.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/chrome/browser/sync/profile_sync_service_mock.h b/chrome/browser/sync/profile_sync_service_mock.h index 4464c3f..69785ff 100644 --- a/chrome/browser/sync/profile_sync_service_mock.h +++ b/chrome/browser/sync/profile_sync_service_mock.h @@ -8,6 +8,7 @@ #include <string> +#include "base/memory/weak_ptr.h" #include "base/string16.h" #include "chrome/browser/sync/glue/change_processor.h" #include "chrome/browser/sync/glue/data_type_controller.h" @@ -21,7 +22,9 @@ class ProfileSyncServiceMock : public ProfileSyncService { virtual ~ProfileSyncServiceMock(); MOCK_METHOD0(DisableForUser, void()); - MOCK_METHOD1(OnBackendInitialized, void(bool)); + MOCK_METHOD2(OnBackendInitialized, + void(const browser_sync::WeakHandle<browser_sync::JsBackend>&, + bool)); MOCK_METHOD0(OnSyncCycleCompleted, void()); MOCK_METHOD0(OnAuthError, void()); MOCK_METHOD4(OnUserSubmittedAuth, @@ -44,7 +47,7 @@ class ProfileSyncServiceMock : public ProfileSyncService { MOCK_METHOD0(InitializeBackend, void()); MOCK_METHOD1(AddObserver, void(Observer*)); MOCK_METHOD1(RemoveObserver, void(Observer*)); - MOCK_METHOD0(GetJsFrontend, browser_sync::JsFrontend*()); + MOCK_METHOD0(GetJsController, base::WeakPtr<browser_sync::JsController>()); MOCK_CONST_METHOD0(HasSyncSetupCompleted, bool()); MOCK_METHOD1(ChangePreferredDataTypes, |