diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
| commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
| tree | ea7f149ccad687b22c18a72b729646568b2d54fb /chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc | |
| parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
| download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc')
| -rw-r--r-- | chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc index abf2357f66..d401f2ef31 100644 --- a/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc +++ b/chrome/browser/sync/test/integration/multiple_client_typed_urls_sync_test.cc @@ -5,11 +5,11 @@ #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/profile_sync_service_harness.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 typed_urls_helper::AddUrlToHistory; using typed_urls_helper::AwaitCheckAllProfilesHaveSameURLsAsVerifier; |