These changes were from downstream and made the chromium compiled with Android NDK r8b

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

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

chrome/browser/prerender/prerender_manager.cc

@@ -208,7 +208,7 @@ PrerenderHandle* PrerenderManager::AddPrerenderFromLinkRelPrerender(
 #if defined(OS_ANDROID)
   // TODO(jcivelli): http://crbug.com/113322 We should have an option to disable
   //                link-prerender and enable omnibox-prerender only.
-  return false;
+  return NULL;
 #else
   DCHECK(!size.IsEmpty());
   if (PrerenderData* parent_prerender_data =

chrome/browser/search_engines/template_url_service.cc

@@ -6,6 +6,7 @@
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
+#include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
@@ -794,11 +795,13 @@ void TemplateURLService::OnWebDataServiceRequestDone(
 
   bool check_if_default_search_valid = !is_default_search_managed_;
 
-#if defined(ENABLE_PROTECTOR_SERVICE)
   // Don't do anything if the default search provider has been changed since the
   // check at the beginning (overridden by Sync).
   if (is_default_search_hijacked &&
       default_search_provider_ == hijacked_default_search_provider) {
+    // Put the #if defined(ENABLE_PROTECTOR_SERVICE) inside the 'if' block to
+    // avoid 'unused-but-set-variable' error.
+#if defined(ENABLE_PROTECTOR_SERVICE)
     // The histograms should be reported even when Protector is disabled.
     scoped_ptr<protector::BaseSettingChange> change(
         protector::CreateDefaultSearchProviderChange(
@@ -818,8 +821,8 @@ void TemplateURLService::OnWebDataServiceRequestDone(
     // The default search provider sanity check makes no sense in this case
     // because ProtectorService is going to change default search eventually.
     check_if_default_search_valid = false;
-  }
 #endif
+  }
 
   if (check_if_default_search_valid) {
     bool has_default_search_provider = default_search_provider_ != NULL &&

chrome/test/perf/perf_test.cc

@@ -389,7 +389,7 @@ std::string MemoryUsageInfoToString(const std::string& test_name,
   AppendResult(output, "ws_final_t", "", "ws_f_t" + trace_name,
                total_working_set_size, "bytes",
                false /* not important */);
-#elif defined(OS_LINUX) || defined(OS_MACOSX)
+#elif defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_ANDROID)
   AppendResult(output, "vm_size_final_b", "", "vm_size_f_b" + trace_name,
                browser_virtual_size, "bytes",
                false /* not important */);