diff options
| author | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 20:04:56 +0000 |
|---|---|---|
| committer | jgreenwald@chromium.org <jgreenwald@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-13 20:04:56 +0000 |
| commit | 7e199326c908b98362c4eaa94429f7875703675d (patch) | |
| tree | b307ad8f94bc3c73a04eb2c6ff336837bd2213a4 /chrome/browser/webdata | |
| parent | 8252a40a112626393c77e34a43ba755f38476ca6 (diff) | |
| download | chromium_src-7e199326c908b98362c4eaa94429f7875703675d.zip chromium_src-7e199326c908b98362c4eaa94429f7875703675d.tar.gz chromium_src-7e199326c908b98362c4eaa94429f7875703675d.tar.bz2 | |
Remove web intents from Chrome on Android build
Chrome on Android doesn't currently support web intents. This change fixes linker errors that occuring when trying to build sync_unit_tests.
BUG=113487
TEST=
Review URL: http://codereview.chromium.org/9521013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126446 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/webdata')
| -rw-r--r-- | chrome/browser/webdata/web_data_service_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/webdata/web_intents_table_unittest.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc index 1f921a7..9eb7bb6 100644 --- a/chrome/browser/webdata/web_data_service_unittest.cc +++ b/chrome/browser/webdata/web_data_service_unittest.cc @@ -741,6 +741,7 @@ TEST_F(WebDataServiceTest, WebIntentsGetAll) { EXPECT_EQ(service, consumer.services_[1]); } +#if defined(ENABLE_WEB_INTENTS) TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) { WebIntentsDefaultsConsumer consumer; @@ -786,6 +787,7 @@ TEST_F(WebDataServiceTest, WebIntentsDefaultsTest) { ASSERT_EQ(1U, consumer.services_.size()); EXPECT_EQ("service_url_2", consumer.services_[0].service_url); } +#endif // defined(ENABLE_WEB_INTENTS) TEST_F(WebDataServiceTest, DidDefaultSearchProviderChangeOnNewProfile) { KeywordsConsumer consumer; diff --git a/chrome/browser/webdata/web_intents_table_unittest.cc b/chrome/browser/webdata/web_intents_table_unittest.cc index d12a285..32887e9 100644 --- a/chrome/browser/webdata/web_intents_table_unittest.cc +++ b/chrome/browser/webdata/web_intents_table_unittest.cc @@ -185,6 +185,7 @@ TEST_F(WebIntentsTableTest, GetByURL) { ASSERT_EQ(2U, intents.size()); } +#if defined(ENABLE_WEB_INTENTS) TEST_F(WebIntentsTableTest, DefaultServices) { DefaultWebIntentService default_service; default_service.action = test_action; @@ -234,5 +235,6 @@ TEST_F(WebIntentsTableTest, DefaultServices) { ASSERT_TRUE(IntentsTable()->GetAllDefaultServices(&defaults)); ASSERT_EQ(1U, defaults.size()); } +#endif // defined(ENABLE_WEB_INTENTS) } // namespace |