summaryrefslogtreecommitdiffstats
path: root/components/components_tests.gyp
diff options
context:
space:
mode:
authorsdefresne <sdefresne@chromium.org>2015-01-20 11:24:43 -0800
committerCommit bot <commit-bot@chromium.org>2015-01-20 19:25:24 +0000
commit46129158888f7a765fc7cf28da16ae9dd159e0fb (patch)
tree9d530dd96a6b230f3c0c12d5c79123e0e32ee920 /components/components_tests.gyp
parent4a5c599932ad9f004ad8c62bf71fc812b994797f (diff)
downloadchromium_src-46129158888f7a765fc7cf28da16ae9dd159e0fb.zip
chromium_src-46129158888f7a765fc7cf28da16ae9dd159e0fb.tar.gz
chromium_src-46129158888f7a765fc7cf28da16ae9dd159e0fb.tar.bz2
Componentize HistoryDatabase
Remove dependency on //content from HistoryDatabase by passing the DownloadInterruptReason value to HistoryDatabase constructor. Introduce HistoryDatabaseParams to allow easier forwarding of the HistoryDatabase parameters from HistoryServiceFactory to the db. Move //components/history/core/{android => browser/android} to avoid having a circular dependency between history_core_browser and history_core_android. Remove history_core_android (//components/core/android) targets. BUG=370850 TBR=bauerb@chromium.org TBR=pkasting@chromium.org TBR=sky@chromium.org TBR=tburkard@chromium.org TBR=jcivelli@chromium.org TBR=robertshield@chromium.org Review URL: https://codereview.chromium.org/849323002 Cr-Commit-Position: refs/heads/master@{#312243}
Diffstat (limited to 'components/components_tests.gyp')
-rw-r--r--components/components_tests.gyp3
1 files changed, 1 insertions, 2 deletions
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index c98b794..77cfc0b 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -146,7 +146,7 @@
'gcm_driver/gcm_stats_recorder_impl_unittest.cc',
'google/core/browser/google_url_tracker_unittest.cc',
'google/core/browser/google_util_unittest.cc',
- 'history/core/android/android_history_types_unittest.cc',
+ 'history/core/browser/android/android_history_types_unittest.cc',
'history/core/browser/history_types_unittest.cc',
'history/core/browser/in_memory_url_index_types_unittest.cc',
'history/core/browser/top_sites_cache_unittest.cc',
@@ -756,7 +756,6 @@
],
'dependencies': [
'../testing/android/native_test.gyp:native_test_native_code',
- 'components.gyp:history_core_android',
],
'dependencies!': [
'components.gyp:feedback_component',