Update webdata files to take advantage of DLOG(FATAL) in

chrome/browser/webdata/token_service_table.cc

Index: chrome/browser/webdata/token_service_table.cc
diff --git a/chrome/browser/webdata/token_service_table.cc b/chrome/browser/webdata/token_service_table.cc
index 6d9a737b6a4d9e5d353758bbea4212a4a00e4e75..c40e704eea64fbd8481f42d5a35ac6dc9199bf0c 100644
--- a/chrome/browser/webdata/token_service_table.cc
+++ b/chrome/browser/webdata/token_service_table.cc
@@ -30,10 +30,6 @@ bool TokenServiceTable::IsSyncable() {
 bool TokenServiceTable::RemoveAllTokens() {
   sql::Statement s(db_->GetUniqueStatement(
       "DELETE FROM token_service"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
 
   return s.Run();
 }
@@ -45,13 +41,11 @@ bool TokenServiceTable::SetTokenForService(const std::string& service,
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT OR REPLACE INTO token_service "
       "(service, encrypted_token) VALUES (?, ?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
+
+  if (!s.is_valid())
     return false;

[Scott Hess - ex-Googler, 2011/12/15 23:02:57]

Why not remove?

[Greg Billock, 2011/12/16 17:26:58]

I was being conservative about executing EncryptString, but I that's probably
overthinking it.

[Scott Hess - ex-Googler, 2011/12/16 22:37:08]

In this case any savings would only happen when things are horribly awry anyhow.

-  }
 
   std::string encrypted_token;
-
   bool encrypted = Encryptor::EncryptString(token, &encrypted_token);
   if (!encrypted) {
     return false;
@@ -60,6 +54,7 @@ bool TokenServiceTable::SetTokenForService(const std::string& service,
   s.BindString(0, service);
   s.BindBlob(1, encrypted_token.data(),
              static_cast<int>(encrypted_token.length()));
+
   return s.Run();
 }
 
@@ -67,10 +62,9 @@ bool TokenServiceTable::GetAllTokens(
     std::map<std::string, std::string>* tokens) {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT service, encrypted_token FROM token_service"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
+
+  if (!s.is_valid())
     return false;
-  }
 
   while (s.Step()) {
     std::string encrypted_token;
@@ -89,4 +83,3 @@ bool TokenServiceTable::GetAllTokens(
   }
   return true;
 }
-