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

chrome/browser/webdata/web_apps_table.cc

 // Copyright (c) 2011 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/web_apps_table.h"
 
 #include "base/logging.h"
 #include "chrome/browser/history/history_database.h"
 #include "googleurl/src/gurl.h"
 #include "sql/statement.h"
@@ skipping 37 matching lines @@
   }
   return true;
 }
 
 bool WebAppsTable::SetWebAppImage(const GURL& url, const SkBitmap& image) {
   // Don't bother with a cached statement since this will be a relatively
   // infrequent operation.
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT OR REPLACE INTO web_app_icons "
       "(url, width, height, image) VALUES (?, ?, ?, ?)"));
-  if (!s)
-    return false;
-
   std::vector<unsigned char> image_data;
   gfx::PNGCodec::EncodeBGRASkBitmap(image, false, &image_data);
-
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
   s.BindInt(1, image.width());
   s.BindInt(2, image.height());
   s.BindBlob(3, &image_data.front(), static_cast<int>(image_data.size()));
+
   return s.Run();
 }
 
 bool WebAppsTable::GetWebAppImages(const GURL& url,
                                   std::vector<SkBitmap>* images) {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT image FROM web_app_icons WHERE url=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
+
   while (s.Step()) {
     SkBitmap image;
     int col_bytes = s.ColumnByteLength(0);
     if (col_bytes > 0) {
       if (gfx::PNGCodec::Decode(
               reinterpret_cast<const unsigned char*>(s.ColumnBlob(0)),
               col_bytes, &image)) {
         images->push_back(image);
       } else {
         // Should only have valid image data in the db.
         NOTREACHED();
       }
     }
   }
-  return true;
+  return s.Succeeded();

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

I think this is right, even though there could be cases where *images is changed
on failure.  WDYT about a local vector<> v, and images->swap(v) in case of
success?

[Greg Billock, 2011/12/21 21:43:03]

I think in this particular case partially filling it is fine. The code doesn't
empty it, which isn't really documented as part of the interface, but... The
caller doesn't check the return value, anyway. :-( I'll update the header.

 }
 
 bool WebAppsTable::SetWebAppHasAllImages(const GURL& url,
                                         bool has_all_images) {
   sql::Statement s(db_->GetUniqueStatement(
       "INSERT OR REPLACE INTO web_apps (url, has_all_images) VALUES (?, ?)"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
   s.BindInt(1, has_all_images ? 1 : 0);
+
   return s.Run();
 }
 
 bool WebAppsTable::GetWebAppHasAllImages(const GURL& url) {
   sql::Statement s(db_->GetUniqueStatement(
       "SELECT has_all_images FROM web_apps WHERE url=?"));
-  if (!s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
+
   return (s.Step() && s.ColumnInt(0) == 1);
 }
 
 bool WebAppsTable::RemoveWebApp(const GURL& url) {
   sql::Statement delete_s(db_->GetUniqueStatement(
       "DELETE FROM web_app_icons WHERE url = ?"));
-  if (!delete_s) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   delete_s.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
+
   if (!delete_s.Run())
     return false;
 
   sql::Statement delete_s2(db_->GetUniqueStatement(
       "DELETE FROM web_apps WHERE url = ?"));
-  if (!delete_s2) {
-    NOTREACHED() << "Statement prepare failed";
-    return false;
-  }
   delete_s2.BindString(0, history::HistoryDatabase::GURLToDatabaseURL(url));
+
   return delete_s2.Run();
 }
-