chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc - Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/notifications/sync_notifier/chrome_notifier_service_unittest.cc

Issue 16561007: Use a direct include of utf_string_conversions.h in chrome/browser/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/notifications/notification_options_menu_model.cc ('k') | chrome/browser/notifications/sync_notifier/synced_notification.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <map>	5 #include <map>

6	6

7 #include "base/memory/scoped_ptr.h"	7 #include "base/memory/scoped_ptr.h"

8 #include "base/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "base/values.h"	9 #include "base/values.h"

10 #include "chrome/browser/notifications/notification.h"	10 #include "chrome/browser/notifications/notification.h"

11 #include "chrome/browser/notifications/notification_test_util.h"	11 #include "chrome/browser/notifications/notification_test_util.h"

12 #include "chrome/browser/notifications/notification_ui_manager.h"	12 #include "chrome/browser/notifications/notification_ui_manager.h"

13 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"	13 #include "chrome/browser/notifications/sync_notifier/chrome_notifier_service.h"

14 #include "chrome/browser/notifications/sync_notifier/synced_notification.h"	14 #include "chrome/browser/notifications/sync_notifier/synced_notification.h"

15 #include "chrome/browser/profiles/profile.h"	15 #include "chrome/browser/profiles/profile.h"

16 #include "sync/api/sync_change.h"	16 #include "sync/api/sync_change.h"

17 #include "sync/api/sync_change_processor.h"	17 #include "sync/api/sync_change_processor.h"

18 #include "sync/api/sync_error_factory.h"	18 #include "sync/api/sync_error_factory.h"

(...skipping 761 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
780 EXPECT_EQ(kTitle2, notification1->GetTitle());	780 EXPECT_EQ(kTitle2, notification1->GetTitle());

781	781

782 // Ensure no new data will be sent to the remote store for notification1.	782 // Ensure no new data will be sent to the remote store for notification1.

783 EXPECT_EQ(0U, processor()->change_list_size());	783 EXPECT_EQ(0U, processor()->change_list_size());

784 EXPECT_FALSE(processor()->ContainsId(kKey1));	784 EXPECT_FALSE(processor()->ContainsId(kKey1));

785 }	785 }

786	786

787 // TODO(petewil): There are more tests to add, such as when we add an API	787 // TODO(petewil): There are more tests to add, such as when we add an API

788 // to allow data entry from the client, we might have a more up to date	788 // to allow data entry from the client, we might have a more up to date

789 // item on the client than the server, or we might have a merge conflict.	789 // item on the client than the server, or we might have a merge conflict.

OLD	NEW