Exclude browser/importer from Android build.

The code in browser/importer is currently causing linker errors when trying to build sync_unit_tests.  Chrome on Android handles importing system settings differently, so this is not needed.

BUG=113487
TEST=


Review URL: http://codereview.chromium.org/9559014

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

chrome/browser/bookmarks/bookmark_extension_api.cc

@@ -916,6 +916,10 @@ bool ImportBookmarksFunction::RunImpl() {
 void ImportBookmarksFunction::FileSelected(const FilePath& path,
                                            int index,
                                            void* params) {
+#if !defined(OS_ANDROID)
+  // Android does not have support for the standard importers.
+  // TODO(jgreenwald): remove ifdef once extensions are no longer built on
+  // Android.
   scoped_refptr<ImporterHost> importer_host(new ImporterHost);
   importer::SourceProfile source_profile;
   source_profile.importer_type = importer::TYPE_BOOKMARKS_FILE;
@@ -925,6 +929,7 @@ void ImportBookmarksFunction::FileSelected(const FilePath& path,
                                      importer::FAVORITES,
                                      new ProfileWriter(profile()),
                                      true);
+#endif
   Release();  // Balanced in BookmarksIOFunction::SelectFile()
 }
 

chrome/browser/net/connection_tester.cc

@@ -12,7 +12,6 @@
 #include "base/message_loop.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/browser/importer/firefox_proxy_settings.h"
 #include "chrome/common/chrome_switches.h"
 #include "net/base/cert_verifier.h"
 #include "net/base/cookie_monster.h"
@@ -34,6 +33,10 @@
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_storage.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/importer/firefox_proxy_settings.h"
+#endif
+
 namespace {
 
 // ExperimentURLRequestContext ------------------------------------------------
@@ -227,6 +230,10 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
   // code.
   int CreateFirefoxProxyConfigService(
       scoped_ptr<net::ProxyConfigService>* config_service) {
+#if defined(OS_ANDROID)
+    // Chrome on Android does not support Firefox settings.
+    return net::ERR_NOT_IMPLEMENTED;
+#else
     // Fetch Firefox's proxy settings (can fail if Firefox is not installed).
     FirefoxProxySettings firefox_settings;
     if (!FirefoxProxySettings::GetSettings(&firefox_settings))
@@ -242,6 +249,7 @@ class ExperimentURLRequestContext : public net::URLRequestContext {
     }
 
     return net::ERR_FAILED;
+#endif
   }
 
   const scoped_refptr<net::URLRequestContext> proxy_request_context_;

chrome/chrome_browser.gypi

@@ -4750,6 +4750,7 @@
             'browser/ui/window_sizer.h',
           ],
           'sources/': [
+            ['exclude', '^browser/importer/'],
             ['exclude', '^browser/themes/'],
             ['exclude', '^browser/ui/panels/'],
             ['exclude', '^browser/ui/tabs/'],