chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc - Issue 584013002: Componentize history_types.{cc,h} and android_history_types.{cc,h}

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/test/integration/two_client_typed_urls_sync_test.cc

Issue 584013002: Componentize history_types.{cc,h} and android_history_types.{cc,h} (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 6 years, 3 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/test/integration/single_client_typed_urls_sync_test.cc ('k') | chrome/browser/sync/test/integration/typed_urls_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

diff --git a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

index bdbf16bfb1ae25dbf66a2e89723c200faefcc0d3..e45c0bcc58209a8879ceccfc2473caf5e9fd187b 100644

--- a/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

+++ b/chrome/browser/sync/test/integration/two_client_typed_urls_sync_test.cc

@@ -5,13 +5,13 @@

#include "base/i18n/number_formatting.h"

#include "base/memory/scoped_vector.h"

#include "base/strings/utf_string_conversions.h"

-#include "chrome/browser/history/history_types.h"

#include "chrome/browser/sessions/session_service.h"

#include "chrome/browser/sync/test/integration/bookmarks_helper.h"

#include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

#include "chrome/browser/sync/test/integration/sync_integration_test_util.h"

#include "chrome/browser/sync/test/integration/sync_test.h"

#include "chrome/browser/sync/test/integration/typed_urls_helper.h"

+#include "components/history/core/browser/history_types.h"

using base::ASCIIToUTF16;

using sync_integration_test_util::AwaitCommitActivityCompletion;