| Index: content/child/web_database_observer_impl.h
|
| diff --git a/content/child/web_database_observer_impl.h b/content/child/web_database_observer_impl.h
|
| index ff283fb32ede5f9b9df3efd8fea33aea63dbd7b5..236ae8537c9b38cf786539df28735dc8e65425b5 100644
|
| --- a/content/child/web_database_observer_impl.h
|
| +++ b/content/child/web_database_observer_impl.h
|
| @@ -22,48 +22,48 @@ class WebDatabaseObserverImpl : public blink::WebDatabaseObserver {
|
| explicit WebDatabaseObserverImpl(IPC::SyncMessageFilter* sender);
|
| virtual ~WebDatabaseObserverImpl();
|
|
|
| - void databaseOpened(const blink::WebString& origin_identifier,
|
| + void databaseOpened(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| const blink::WebString& database_display_name,
|
| unsigned long estimated_size) override;
|
| - void databaseModified(const blink::WebString& origin_identifier,
|
| + void databaseModified(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name) override;
|
| - void databaseClosed(const blink::WebString& origin_identifier,
|
| + void databaseClosed(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name) override;
|
| - void reportOpenDatabaseResult(const blink::WebString& origin_identifier,
|
| + void reportOpenDatabaseResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int callsite,
|
| int websql_error,
|
| int sqlite_error,
|
| double call_time) override;
|
| - void reportChangeVersionResult(const blink::WebString& origin_identifier,
|
| + void reportChangeVersionResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int callsite,
|
| int websql_error,
|
| int sqlite_error) override;
|
| - void reportStartTransactionResult(const blink::WebString& origin_identifier,
|
| + void reportStartTransactionResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int callsite,
|
| int websql_error,
|
| int sqlite_error) override;
|
| - void reportCommitTransactionResult(const blink::WebString& origin_identifier,
|
| + void reportCommitTransactionResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int callsite,
|
| int websql_error,
|
| int sqlite_error) override;
|
| - void reportExecuteStatementResult(const blink::WebString& origin_identifier,
|
| + void reportExecuteStatementResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int callsite,
|
| int websql_error,
|
| int sqlite_error) override;
|
| - void reportVacuumDatabaseResult(const blink::WebString& origin_identifier,
|
| + void reportVacuumDatabaseResult(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int sqlite_error) override;
|
|
|
| bool WaitForAllDatabasesToClose(base::TimeDelta timeout);
|
|
|
| private:
|
| - void HandleSqliteError(const blink::WebString& origin_identifier,
|
| + void HandleSqliteError(const blink::WebSecurityOrigin& origin,
|
| const blink::WebString& database_name,
|
| int error);
|
|
|
|
|