chrome/browser/sync/profile_sync_service_startup_unittest.cc - Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/profile_sync_service_startup_unittest.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/profile_sync_service_session_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_startup_unittest.cc

===================================================================

--- chrome/browser/sync/profile_sync_service_startup_unittest.cc (revision 91968)

+++ chrome/browser/sync/profile_sync_service_startup_unittest.cc (working copy)

@@ -13,12 +13,12 @@

#include "chrome/browser/sync/profile_sync_factory_mock.h"

#include "chrome/browser/sync/profile_sync_test_util.h"

#include "chrome/browser/sync/test_profile_sync_service.h"

+#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/net/gaia/gaia_auth_consumer.h"

#include "chrome/common/net/gaia/gaia_constants.h"

#include "chrome/common/pref_names.h"

#include "chrome/test/testing_profile.h"

#include "content/browser/browser_thread.h"

-#include "content/common/notification_type.h"

#include "testing/gmock/include/gmock/gmock.h"

using browser_sync::DataTypeManager;

@@ -251,9 +251,9 @@

configure_result, FROM_HERE, syncable::ModelTypeSet());

EXPECT_CALL(*data_type_manager, Configure(_, _)).

WillRepeatedly(DoAll(NotifyFromDataTypeManager(data_type_manager,

- NotificationType::SYNC_CONFIGURE_START),

+ chrome::NOTIFICATION_SYNC_CONFIGURE_START),

NotifyFromDataTypeManagerWithResult(data_type_manager,

- NotificationType::SYNC_CONFIGURE_DONE,

+ chrome::NOTIFICATION_SYNC_CONFIGURE_DONE,

&result)));

EXPECT_CALL(*data_type_manager, state()).

WillOnce(Return(DataTypeManager::STOPPED));