| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/logging.h" | 5 #include "base/logging.h" |
| 6 #include "chrome/browser/chromeos/input_method/ibus_controller_impl.h" | 6 #include "chrome/browser/chromeos/input_method/ibus_controller_impl.h" |
| 7 #include "chrome/browser/chromeos/input_method/input_method_property.h" | 7 #include "chromeos/ime/input_method_property.h" |
| 8 #include "testing/gtest/include/gtest/gtest.h" | 8 #include "testing/gtest/include/gtest/gtest.h" |
| 9 | 9 |
| 10 namespace chromeos { | 10 namespace chromeos { |
| 11 namespace input_method { | 11 namespace input_method { |
| 12 | 12 |
| 13 namespace { | 13 namespace { |
| 14 | 14 |
| 15 bool FindAndUpdateProperty(const InputMethodProperty& new_prop, | 15 bool FindAndUpdateProperty(const InputMethodProperty& new_prop, |
| 16 InputMethodPropertyList* prop_list) { | 16 InputMethodPropertyList* prop_list) { |
| 17 return IBusControllerImpl::FindAndUpdatePropertyForTesting(new_prop, | 17 return IBusControllerImpl::FindAndUpdatePropertyForTesting(new_prop, |
| (...skipping 26 matching lines...) Expand all Loading... |
| 44 EXPECT_EQ(InputMethodProperty("key2", "label2", false, false), | 44 EXPECT_EQ(InputMethodProperty("key2", "label2", false, false), |
| 45 properties[1]); | 45 properties[1]); |
| 46 EXPECT_TRUE(FindAndUpdateProperty( | 46 EXPECT_TRUE(FindAndUpdateProperty( |
| 47 InputMethodProperty("key2", "labelZ", false, false), &properties)); | 47 InputMethodProperty("key2", "labelZ", false, false), &properties)); |
| 48 EXPECT_EQ(InputMethodProperty("key2", "labelZ", false, false), | 48 EXPECT_EQ(InputMethodProperty("key2", "labelZ", false, false), |
| 49 properties[1]); | 49 properties[1]); |
| 50 } | 50 } |
| 51 | 51 |
| 52 } // namespace input_method | 52 } // namespace input_method |
| 53 } // namespace chromeos | 53 } // namespace chromeos |
| OLD | NEW |