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

chrome/browser/ui/intents/web_intent_picker_controller.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #define CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_
 #pragma once
 
+#if defined(OS_ANDROID)

[Ben Goodger (Google), 2012/07/09 15:33:34]

looks like you're not building this file, which implies to me that code that you
are building is including this file, and that's causing you grief.

what code is including this file?

[Philippe, 2012/07/09 16:22:36]

I see at least these files explicitly including this header:
chrome/browser/ui/browser.cc
chrome/browser/ui/extensions/shell_window.cc
chrome/browser/ui/gtk/web_intent_picker_gtk.cc
chrome/browser/ui/intents/web_intent_picker_controller.cc
chrome/browser/ui/tab_contents/tab_contents.cc

My concern is mainly about browser.cc and tab_contents.cc. I think that the
current approach introduces less #ifdefs than the other one which would be to
include #ifdefs in these two files both at the include and usage levels.

What do you think?

+// Include a dummy header for Android. Android does not use web intent (at
+// least for now).
+#include "chrome/browser/ui/intents/web_intent_picker_controller_android.h"
+#else
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/webstore_installer.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/cws_intents_registry.h"
@@ skipping 180 matching lines @@
   content::WebContents* service_tab_;
 
   // Request consumer used when asynchronously loading favicons.
   CancelableRequestConsumerTSimple<size_t> favicon_consumer_;
 
   base::WeakPtrFactory<WebIntentPickerController> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentPickerController);
 };
 
+#endif  // !OS_ANDROID
 #endif  // CHROME_BROWSER_UI_INTENTS_WEB_INTENT_PICKER_CONTROLLER_H_