sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc - Issue 16358024: Use a direct include of strings headers in rlz/, sandbox/, skia/, sql/, sync/.

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: sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc

Issue 16358024: Use a direct include of strings headers in rlz/, sandbox/, skia/, sql/, sync/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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 | « sync/engine/apply_control_data_updates_unittest.cc ('k') | sync/engine/build_commit_command.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2012 The Chromium Authors. All rights reserved.	1 // Copyright 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 <string>	5 #include <string>

6	6

7 #include "base/location.h"	7 #include "base/location.h"

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

9 #include "base/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "sync/engine/apply_updates_and_resolve_conflicts_command.h"	10 #include "sync/engine/apply_updates_and_resolve_conflicts_command.h"

11 #include "sync/engine/syncer.h"	11 #include "sync/engine/syncer.h"

12 #include "sync/internal_api/public/test/test_entry_factory.h"	12 #include "sync/internal_api/public/test/test_entry_factory.h"

13 #include "sync/protocol/bookmark_specifics.pb.h"	13 #include "sync/protocol/bookmark_specifics.pb.h"

14 #include "sync/protocol/password_specifics.pb.h"	14 #include "sync/protocol/password_specifics.pb.h"

15 #include "sync/syncable/mutable_entry.h"	15 #include "sync/syncable/mutable_entry.h"

16 #include "sync/syncable/syncable_id.h"	16 #include "sync/syncable/syncable_id.h"

17 #include "sync/syncable/syncable_read_transaction.h"	17 #include "sync/syncable/syncable_read_transaction.h"

18 #include "sync/syncable/syncable_util.h"	18 #include "sync/syncable/syncable_util.h"

19 #include "sync/syncable/syncable_write_transaction.h"	19 #include "sync/syncable/syncable_write_transaction.h"

(...skipping 387 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
407	407

408 const sessions::StatusController& status = session()->status_controller();	408 const sessions::StatusController& status = session()->status_controller();

409 EXPECT_EQ(1, status.num_encryption_conflicts())	409 EXPECT_EQ(1, status.num_encryption_conflicts())

410 << "The updates that can't be decrypted should be in encryption "	410 << "The updates that can't be decrypted should be in encryption "

411 << "conflict";	411 << "conflict";

412 EXPECT_EQ(1, status.num_updates_applied())	412 EXPECT_EQ(1, status.num_updates_applied())

413 << "The undecryptable password update shouldn't be applied";	413 << "The undecryptable password update shouldn't be applied";

414 }	414 }

415	415

416 } // namespace syncer	416 } // namespace syncer

OLD	NEW