The changes for compiling with Android NDK r8b

chrome/browser/search_engines/template_url_service.cc

 // 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.
 
 #include "chrome/browser/search_engines/template_url_service.h"
 
 #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"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 672 matching lines @@
   bool database_specified_a_default = (default_search_provider != NULL);
 
   // Check if default search provider is now managed.
   scoped_ptr<TemplateURL> default_from_prefs;
   LoadDefaultSearchProviderFromPrefs(&default_from_prefs,
                                      &is_default_search_managed_);
 
   // Check if the default search provider has been changed in Web Data by
   // another program. No immediate action is performed because the default
   // search may be changed below by Sync which effectively undoes the hijacking.
-  bool is_default_search_hijacked = false;
-  TemplateURL* hijacked_default_search_provider = NULL;
+  bool ALLOW_UNUSED is_default_search_hijacked = false;

[James Hawkins, 2012/07/30 03:09:09]

Why are you using ALLOW_UNUSED here?

[michaelbai, 2012/07/30 16:59:21]

I compiled this file by the gcc 4.6, there was a 
-werror=unused-but-set-variable error.

On 2012/07/30 03:09:09, James Hawkins wrote:

+  TemplateURL* ALLOW_UNUSED hijacked_default_search_provider = NULL;
   scoped_ptr<TemplateURL> backup_default_search_provider;
   // No check is required if the default search is managed.
   // |DidDefaultSearchProviderChange| must always be called because it will
   // take care of the unowned backup default search provider instance.
   if (DidDefaultSearchProviderChange(*result, profile_,
                                      &backup_default_search_provider) &&
       !is_default_search_managed_) {
     hijacked_default_search_provider = default_search_provider;
     is_default_search_hijacked = true;
   }
@@ skipping 74 matching lines @@
   // Index any visits that occurred before we finished loading.
   for (size_t i = 0; i < visits_to_add_.size(); ++i)
     UpdateKeywordSearchTermsForURL(visits_to_add_[i]);
   visits_to_add_.clear();
 
   if (new_resource_keyword_version)
     service_->SetBuiltinKeywordVersion(new_resource_keyword_version);
 
   bool check_if_default_search_valid = !is_default_search_managed_;
 
 #if defined(ENABLE_PROTECTOR_SERVICE)

[Yaron, 2012/07/27 17:34:31]

Alternatively, you could push this #if define deeper into the if statement
guarding only the calls to the actual protector service.

[michaelbai, 2012/07/27 20:38:36]

That will disable a lot of code, I don't know there are unit tests could verify
the changes. I'd prefer to add ALLOW_UNUSED.

On 2012/07/27 17:34:31, Yaron wrote:

[Yaron, 2012/07/27 20:40:43]

No. I'm saying to move it to L804 or so and if-def less code. My concern is that
allowing it to be unused can cause other people to accidentally also not use it
when. Either way, I defer to sky@

[sky, 2012/08/01 00:22:45]

Agree with Yaron. Move code into ifdef as necessary.

[michaelbai, 2012/08/01 01:49:22]

Done.

   // 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) {
     // The histograms should be reported even when Protector is disabled.
     scoped_ptr<protector::BaseSettingChange> change(
         protector::CreateDefaultSearchProviderChange(
             hijacked_default_search_provider,
             backup_default_search_provider.release()));
     if (protector::IsEnabled()) {
@@ skipping 1677 matching lines @@
     // TODO(mpcomplete): If we allow editing extension keywords, then those
     // should be persisted to disk and synced.
     if (template_url->sync_guid().empty() &&
         !template_url->IsExtensionKeyword()) {
       template_url->data_.sync_guid = base::GenerateGUID();
       if (service_.get())
         service_->UpdateKeyword(template_url->data());
     }
   }
 }