[Android] Upstream content detection and ChromeBrowserProvider tests.

chrome/browser/history/android/android_provider_backend.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/history/android/android_provider_backend.h"
 
 #include "base/i18n/case_conversion.h"
 #include "chrome/browser/api/bookmarks/bookmark_service.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/android/android_urls_sql_handler.h"
@@ skipping 606 matching lines @@
   if (!id)
     // Note the passed in Time() will be changed in UpdateSearchTermTable().
     id = history_db_->AddSearchTerm(values.search_term(), Time());
   return id;
 }
 
 bool AndroidProviderBackend::DeleteSearchTerms(
     const std::string& selection,
     const std::vector<string16>& selection_args,
     int * deleted_count) {
+  if (!EnsureInitializedAndUpdated())
+    return false;
+
   SearchTerms rows;
   if (!GetSelectedSearchTerms(selection, selection_args, &rows))
     return false;
 
   *deleted_count = rows.size();
   if (rows.empty())
     return true;
 
   for (SearchTerms::const_iterator i = rows.begin(); i != rows.end(); ++i)
     if (!history_db_->DeleteKeywordSearchTerm(*i))
@@ skipping 529 matching lines @@
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
                           values.template_url_id(), values.search_term()))
       return false;
   }
   return true;
 }
 
 }  // namespace history