Remove operator function.

chrome/browser/chromeos/input_method/input_method_manager_impl_unittest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/input_method/input_method_manager_impl.h"
 
 #include <algorithm>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 13 matching lines @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/ime/text_input_test_support.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 
 namespace chromeos {
 
 namespace input_method {
 namespace {
 
+bool IsContained(const InputMethodDescriptors& descriptors,

[satorux1, 2013/04/19 03:54:17]

function comment is missing. Besides, IsContained() sounds weird. Contain()
would be ok:

Returns true if |descriptors| contain |target|.

[Seigo Nonaka, 2013/04/20 04:50:31]

Done.

+                 const InputMethodDescriptor& target) {
+  for (size_t i = 0; i < descriptors.size(); ++i) {
+    if (descriptors[i].id() == target.id())
+      return true;
+  }
+  return false;
+}
+
 class InputMethodManagerImplTest :  public testing::Test {
  public:
   InputMethodManagerImplTest()
       : delegate_(NULL),
         controller_(NULL),
         candidate_window_controller_(NULL),
         xkeyboard_(NULL) {
   }
   virtual ~InputMethodManagerImplTest() {}
 
@@ skipping 193 matching lines @@
 }
 
 TEST_F(InputMethodManagerImplTest, TestGetSupportedInputMethods) {
   scoped_ptr<InputMethodDescriptors> methods(
       manager_->GetSupportedInputMethods());
   ASSERT_TRUE(methods.get());
   // Try to find random 4-5 layuts and IMEs to make sure the returned list is
   // correct.
   const InputMethodDescriptor* id_to_find =
       manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId("mozc");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
   id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
       "mozc-chewing");
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
   id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
       "xkb:us::eng");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
   id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
       "xkb:us:dvorak:eng");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
   id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
       "xkb:fr::fra");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
 }
 
 TEST_F(InputMethodManagerImplTest, TestEnableLayouts) {
   // Currently 5 keyboard layouts are supported for en-US, and 1 for ja. See
   // ibus_input_method.txt.
   ComponentExtensionInitialize();
   manager_->EnableLayouts("en-US", "");
   EXPECT_EQ(5U, manager_->GetNumActiveInputMethods());
   {
     // For http://crbug.com/19655#c11 - (1)
     scoped_ptr<InputMethodDescriptors> methods(
         manager_->GetActiveInputMethods());
     const InputMethodDescriptor* id_to_find =
         manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
             "english-m");  // The "English Mystery" IME.
-    EXPECT_EQ(methods->end(),
-              std::find(methods->begin(), methods->end(), *id_to_find));
+    EXPECT_FALSE(IsContained(*methods.get(), *id_to_find));
   }
   // For http://crbug.com/19655#c11 - (2)
   EXPECT_EQ(0, mock_ibus_daemon_controller_->start_count());
 
   // For http://crbug.com/19655#c11 - (5)
   // The hardware keyboard layout "xkb:us::eng" is always active, hence 2U.
   manager_->EnableLayouts("ja", "");  // Japanese
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(0, mock_ibus_daemon_controller_->start_count());
 }
@@ skipping 13 matching lines @@
 TEST_F(InputMethodManagerImplTest, TestActiveInputMethods) {
   manager_->EnableLayouts("ko", "");  // Korean
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   scoped_ptr<InputMethodDescriptors> methods(
       manager_->GetActiveInputMethods());
   ASSERT_TRUE(methods.get());
   EXPECT_EQ(2U, methods->size());
   const InputMethodDescriptor* id_to_find =
       manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
           "xkb:us::eng");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
   id_to_find = manager_->GetInputMethodUtil()->GetInputMethodDescriptorFromId(
       "xkb:kr:kr104:kor");
-  EXPECT_NE(methods->end(),
-            std::find(methods->begin(), methods->end(), *id_to_find));
+  EXPECT_TRUE(IsContained(*methods.get(), *id_to_find));
 }
 
 TEST_F(InputMethodManagerImplTest, TestSetInputMethodConfig) {
   InputMethodConfigValue config;
   config.type = InputMethodConfigValue::kValueTypeString;
   config.string_value = "string";
   EXPECT_EQ(0, controller_->set_input_method_config_internal_count_);
   EXPECT_TRUE(manager_->SetInputMethodConfig("section", "name", config));
   EXPECT_EQ(1, controller_->set_input_method_config_internal_count_);
   EXPECT_EQ("section",
@@ skipping 865 matching lines @@
   EXPECT_EQ(2U, manager_->GetNumActiveInputMethods());
   EXPECT_EQ(1, controller_->change_input_method_count_);
   EXPECT_EQ(ext_id1, controller_->change_input_method_id_);
   manager_->ChangeInputMethod(ext_id2);
   EXPECT_EQ(2, controller_->change_input_method_count_);
   EXPECT_EQ(ext_id2, controller_->change_input_method_id_);
 }
 
 }  // namespace input_method
 }  // namespace chromeos