Fix web-intent-related unit_tests linking issues on Android.

This disables the build of browser/ui/intent.


Review URL: https://chromiumcodereview.appspot.com/10696072

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146118 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/tab_contents/tab_contents.cc

@@ -124,10 +124,10 @@ TabContents::TabContents(WebContents* contents)
   synced_tab_delegate_.reset(new TabContentsSyncedTabDelegate(this));
   content_settings_.reset(new TabSpecificContentSettings(contents));
   translate_tab_helper_.reset(new TranslateTabHelper(contents));
-  web_intent_picker_controller_.reset(new WebIntentPickerController(this));
   zoom_controller_.reset(new ZoomController(this));
 
 #if !defined(OS_ANDROID)
+  web_intent_picker_controller_.reset(new WebIntentPickerController(this));
   sad_tab_helper_.reset(new SadTabHelper(contents));
 #endif
 

chrome/chrome_browser.gypi

@@ -4880,6 +4880,7 @@
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/chrome_to_mobile'],
             ['exclude', '^browser/importer/'],
+            ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/panels/'],
             ['exclude', '^browser/ui/tabs/'],
             ['exclude', '^browser/ui/toolbar/'],

chrome/chrome_tests.gypi

@@ -2436,6 +2436,7 @@
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/chrome_to_mobile'],
             ['exclude', '^browser/themes/'],
+            ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/panels'],
             ['exclude', '^browser/ui/tabs/'],
             ['exclude', '^browser/ui/toolbar/'],