Exclude ProtectorService code from Android build.

chrome/browser/webdata/keyword_table.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/webdata/keyword_table.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/protector/histograms.h"
-#include "chrome/browser/protector/protector_service.h"
+#include "chrome/browser/protector/protector.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "googleurl/src/gurl.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 
 using base::Time;
 
 // static
 const char KeywordTable::kDefaultSearchProviderKey[] =
     "Default Search Provider ID";
@@ skipping 49 matching lines @@
   s->BindInt(starting_column + 13, 0);
   s->BindBool(starting_column + 14, url.created_by_policy());
   s->BindString(starting_column + 15,
                 url.instant_url() ? url.instant_url()->url() : std::string());
   s->BindInt64(starting_column + 16, url.last_modified().ToTimeT());
   s->BindString(starting_column + 17, url.sync_guid());
 }
 
 // Signs search provider id and returns its signature.
 std::string GetSearchProviderIDSignature(int64 id) {
   return protector::SignSetting(base::Int64ToString(id));

[Yaron, 2012/03/28 21:23:22]

I think I'm missing something as this is still using "protector". Was it that
the move of those utils out of protector service because they're actually more
eneral util such as for signing, here? That's why we can do it regardless of
protector? If so, we could probably rename this to protector_utils::... or just
SigningUtils

[nilesh, 2012/03/28 23:35:11]

Yeah the methods moved out of ProtectorService are more general. I am renaming
protector.h to protector_utils.h. I can't easily move them out of protector/ as
they depend on browser/protector/internal (separate repository) for the
signing-key.

 }
 
 // Checks if signature for search provider id is correct and returns the
 // result.
 bool IsSearchProviderIDValid(int64 id, const std::string& signature) {
   return protector::IsSettingValid(base::Int64ToString(id), signature);
 }
 
 }  // anonymous namespace
 
@@ skipping 367 matching lines @@
   int64 default_search_id = GetDefaultSearchProviderID();
   if (!meta_table_->SetValue(kDefaultSearchIDBackupKey,
                              default_search_id)) {
     LOG(ERROR) << "Can't write default search id backup.";
     return false;
   }
 
   *id = default_search_id;
   return true;
 }