Remove isSyncDatabase in WebDatabaseObserver [2/3]

content/child/web_database_observer_impl.cc

 // Copyright 2013 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 "content/child/web_database_observer_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "content/common/database_messages.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
@@ skipping 20 matching lines @@
   if (websql_error == -1)
     return 0;  // no error
 
   // SQLExceptionCode starts at 1000
   if (websql_error >= 1000)
     websql_error -= 1000;
 
   return std::min(websql_error + 30, kResultHistogramSize - 1);
 }
 
-#define UMA_HISTOGRAM_WEBSQL_RESULT(name, is_sync_database, \
-                                    callsite, websql_error, sqlite_error) \
+#define UMA_HISTOGRAM_WEBSQL_RESULT(name, callsite, websql_error, sqlite_error) \
   do { \
     DCHECK(callsite < kCallsiteHistogramSize); \
     int result = DetermineHistogramResult(websql_error, sqlite_error); \
-    if (is_sync_database) { \
-      UMA_HISTOGRAM_ENUMERATION("websql.Sync." name, \
-                                result, kResultHistogramSize); \
-      if (result) { \
-        UMA_HISTOGRAM_ENUMERATION("websql.Sync." name ".ErrorSite", \
-                                  callsite, kCallsiteHistogramSize); \
-      } \
-    } else { \
-      UMA_HISTOGRAM_ENUMERATION("websql.Async." name, \
-                                result, kResultHistogramSize); \
-      if (result) { \
-        UMA_HISTOGRAM_ENUMERATION("websql.Async." name ".ErrorSite", \
-                                  callsite, kCallsiteHistogramSize); \
-      } \
+    UMA_HISTOGRAM_ENUMERATION("websql.Async." name, \
+                              result, kResultHistogramSize); \
+    if (result) { \
+      UMA_HISTOGRAM_ENUMERATION("websql.Async." name ".ErrorSite", \
+                                callsite, kCallsiteHistogramSize); \
     } \
   } while (0)
-
 }  // namespace
 
 WebDatabaseObserverImpl::WebDatabaseObserverImpl(IPC::SyncMessageFilter* sender)
     : sender_(sender),
       open_connections_(new storage::DatabaseConnectionsWrapper) {
   DCHECK(sender);
 }
 
 WebDatabaseObserverImpl::~WebDatabaseObserverImpl() {
 }
@@ skipping 22 matching lines @@
     const WebString& database_name) {
   sender_->Send(new DatabaseHostMsg_Closed(
       origin_identifier.utf8(), database_name));
   open_connections_->RemoveOpenConnection(origin_identifier.utf8(),
                                           database_name);
 }
 
 void WebDatabaseObserverImpl::reportOpenDatabaseResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int callsite, int websql_error, int sqlite_error) {
-  UMA_HISTOGRAM_WEBSQL_RESULT("OpenResult", is_sync_database, callsite,
+  UMA_HISTOGRAM_WEBSQL_RESULT("OpenResult", callsite,
                               websql_error, sqlite_error);
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::reportChangeVersionResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int callsite, int websql_error, int sqlite_error) {
-  UMA_HISTOGRAM_WEBSQL_RESULT("ChangeVersionResult", is_sync_database, callsite,
+  UMA_HISTOGRAM_WEBSQL_RESULT("ChangeVersionResult", callsite,
                               websql_error, sqlite_error);
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::reportStartTransactionResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int callsite, int websql_error, int sqlite_error) {
-  UMA_HISTOGRAM_WEBSQL_RESULT("BeginResult", is_sync_database, callsite,
+  UMA_HISTOGRAM_WEBSQL_RESULT("BeginResult", callsite,
                               websql_error, sqlite_error);
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::reportCommitTransactionResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int callsite, int websql_error, int sqlite_error) {
-  UMA_HISTOGRAM_WEBSQL_RESULT("CommitResult", is_sync_database, callsite,
+  UMA_HISTOGRAM_WEBSQL_RESULT("CommitResult", callsite,
                               websql_error, sqlite_error);
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::reportExecuteStatementResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int callsite, int websql_error, int sqlite_error) {
-  UMA_HISTOGRAM_WEBSQL_RESULT("StatementResult", is_sync_database, callsite,
+  UMA_HISTOGRAM_WEBSQL_RESULT("StatementResult", callsite,
                               websql_error, sqlite_error);
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::reportVacuumDatabaseResult(
     const WebString& origin_identifier,
     const WebString& database_name,
-    bool is_sync_database,
     int sqlite_error) {
   int result = DetermineHistogramResult(-1, sqlite_error);
-  if (is_sync_database) {
-    UMA_HISTOGRAM_ENUMERATION("websql.Sync.VacuumResult",
+  UMA_HISTOGRAM_ENUMERATION("websql.Async.VacuumResult",
                               result, kResultHistogramSize);
-  } else {
-    UMA_HISTOGRAM_ENUMERATION("websql.Async.VacuumResult",
-                              result, kResultHistogramSize);
-  }
+
   HandleSqliteError(origin_identifier, database_name, sqlite_error);
 }
 
 void WebDatabaseObserverImpl::WaitForAllDatabasesToClose() {
   open_connections_->WaitForAllDatabasesToClose();
 }
 
 void WebDatabaseObserverImpl::HandleSqliteError(
     const WebString& origin_identifier,
     const WebString& database_name,
     int error) {
   // We filter out errors which the backend doesn't act on to avoid
   // a unnecessary ipc traffic, this method can get called at a fairly
   // high frequency (per-sqlstatement).
   if (error == SQLITE_CORRUPT || error == SQLITE_NOTADB) {
     sender_->Send(new DatabaseHostMsg_HandleSqliteError(
         origin_identifier.utf8(),
         database_name,
         error));
   }
 }
 
 }  // namespace content