Fix android unit_test compilation errors introduced by https://chromiumcodereview.appspot.com/98520…

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/bookmarks/bookmark_service.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/browser/history/android/android_time.h"
@@ skipping 298 matching lines @@
       if (!history_db_->GetURLRow(i->url_id, &url_row))
         return false;
       modified->changed_urls.push_back(url_row);
     }
     if (row.is_value_set_explicitly(HistoryAndBookmarkRow::FAVICON))
       favicon->urls.insert(i->url);
   }
 
   if (!modified->changed_urls.empty())
     notifications->push_back(HistoryNotification(
-        chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, modified.release()));
+        chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, modified.release()));
 
   if (!favicon->urls.empty())
     notifications->push_back(HistoryNotification(
         chrome::NOTIFICATION_FAVICON_CHANGED, favicon.release()));
 
   return true;
 }
 
 AndroidURLID AndroidProviderBackend::InsertHistoryAndBookmark(
     const HistoryAndBookmarkRow& values,
@@ skipping 25 matching lines @@
   scoped_ptr<FaviconChangeDetails> favicon;
   if (row.is_value_set_explicitly(HistoryAndBookmarkRow::FAVICON) &&
       !row.favicon().empty()) {
     favicon.reset(new FaviconChangeDetails);
     if (!favicon.get())
       return false;
     favicon->urls.insert(url_row.url());
   }
 
   notifications->push_back(HistoryNotification(
-      chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, modified.release()));
+      chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, modified.release()));
   if (favicon.get())
     notifications->push_back(HistoryNotification(
         chrome::NOTIFICATION_FAVICON_CHANGED, favicon.release()));
 
   return row.id();
 }
 
 bool AndroidProviderBackend::DeleteHistoryAndBookmarks(
     const std::string& selection,
     const std::vector<string16>& selection_args,
@@ skipping 54 matching lines @@
        i != bookmark_rows.end(); ++i) {
     URLRow row(i->url);
     // Set visit time as UnixEpoch because the Android's system time start from
     // the unix epoch.
     row.set_last_visit(Time::UnixEpoch());
     if (!history_db_->AddURL(row))
       return false;
     modified->changed_urls.push_back(row);
   }
   notifications->push_back(HistoryNotification(
-      chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, modified.release()));
+      chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, modified.release()));
 
   return true;
 }
 
 AndroidStatement* AndroidProviderBackend::QuerySearchTerms(
     const std::vector<SearchRow::ColumnID>& projections,
     const std::string& selection,
     const std::vector<string16>& selection_args,
     const std::string& sort_order) {
   if (projections.empty())
@@ skipping 519 matching lines @@
 
   modified->changed_urls.push_back(new_url_row);
 
   notifications->push_back(HistoryNotification(
       chrome::NOTIFICATION_HISTORY_URLS_DELETED,
       deleted_details.release()));
   if (favicon_details.get() && !favicon_details->urls.empty())
     notifications->push_back(HistoryNotification(
         chrome::NOTIFICATION_FAVICON_CHANGED, favicon_details.release()));
   notifications->push_back(HistoryNotification(
-      chrome::NOTIFICATION_HISTORY_TYPED_URLS_MODIFIED, modified.release()));
+      chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, modified.release()));
 
   return true;
 }
 
 AndroidStatement* AndroidProviderBackend::QueryHistoryAndBookmarksInternal(
     const std::vector<HistoryAndBookmarkRow::ColumnID>& projections,
     const std::string& selection,
     const std::vector<string16>& selection_args,
     const std::string& sort_order) {
   std::string sql;
@@ skipping 108 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