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, 48 insertions, 0 deletions

diff --git a/chromium/ui/base/ime/chromeos/mock_ime_input_context_handler.cc b/chromium/ui/base/ime/chromeos/mock_ime_input_context_handler.cc
new file mode 100644
index 00000000000..4d8d40c0391
--- /dev/null
+++ b/chromium/ui/base/ime/chromeos/mock_ime_input_context_handler.cc
@@ -0,0 +1,48 @@
+// 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 "ui/base/ime/chromeos/mock_ime_input_context_handler.h"
+
+#include "chromeos/ime/ibus_text.h"
+
+namespace chromeos {
+
+MockIMEInputContextHandler::MockIMEInputContextHandler()
+    : commit_text_call_count_(0),
+      update_preedit_text_call_count_(0),
+      delete_surrounding_text_call_count_(0) {
+}
+
+MockIMEInputContextHandler::~MockIMEInputContextHandler() {
+}
+
+void MockIMEInputContextHandler::CommitText(const std::string& text) {
+  ++commit_text_call_count_;
+  last_commit_text_ = text;
+}
+
+void MockIMEInputContextHandler::UpdatePreeditText(const IBusText& text,
+                                                   uint32 cursor_pos,
+                                                   bool visible) {
+  ++update_preedit_text_call_count_;
+  last_update_preedit_arg_.ibus_text.CopyFrom(text);
+  last_update_preedit_arg_.cursor_pos = cursor_pos;
+  last_update_preedit_arg_.is_visible = visible;
+}
+
+void MockIMEInputContextHandler::DeleteSurroundingText(int32 offset,
+                                                       uint32 length) {
+  ++delete_surrounding_text_call_count_;
+  last_delete_surrounding_text_arg_.offset = offset;
+  last_delete_surrounding_text_arg_.length = length;
+}
+
+void MockIMEInputContextHandler::Reset() {
+  commit_text_call_count_ = 0;
+  update_preedit_text_call_count_ = 0;
+  delete_surrounding_text_call_count_ = 0;
+  last_commit_text_.clear();
+}
+
+}  // namespace chromeos