Update to new stable branch 1750

This also includes an updated ninja and chromium dependencies
needed on Windows.

Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>

1 files changed, 37 insertions, 0 deletions

diff --git a/chromium/content/browser/indexed_db/mock_indexed_db_callbacks.h b/chromium/content/browser/indexed_db/mock_indexed_db_callbacks.h
new file mode 100644
index 00000000000..1af3ca1781e
--- /dev/null
+++ b/chromium/content/browser/indexed_db/mock_indexed_db_callbacks.h
@@ -0,0 +1,37 @@
+// 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.
+
+#ifndef CONTENT_BROWSER_INDEXED_DB_MOCK_INDEXED_DB_CALLBACKS_H_
+#define CONTENT_BROWSER_INDEXED_DB_MOCK_INDEXED_DB_CALLBACKS_H_
+
+#include "content/browser/indexed_db/indexed_db_callbacks.h"
+#include "content/browser/indexed_db/indexed_db_connection.h"
+
+namespace content {
+
+class MockIndexedDBCallbacks : public IndexedDBCallbacks {
+ public:
+  MockIndexedDBCallbacks();
+  MockIndexedDBCallbacks(bool expect_connection);
+
+  virtual void OnSuccess() OVERRIDE;
+  virtual void OnSuccess(const std::vector<base::string16>&) OVERRIDE;
+  virtual void OnSuccess(scoped_ptr<IndexedDBConnection> connection,
+                         const IndexedDBDatabaseMetadata& metadata) OVERRIDE;
+  IndexedDBConnection* connection() { return connection_.get(); }
+
+ protected:
+  virtual ~MockIndexedDBCallbacks();
+
+  scoped_ptr<IndexedDBConnection> connection_;
+
+ private:
+  bool expect_connection_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockIndexedDBCallbacks);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_INDEXED_DB_MOCK_INDEXED_DB_CALLBACKS_H_