Refactoring the ownership of ui::InputMethod.

ui/base/accelerators/accelerator_manager_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 "ui/base/accelerators/accelerator_manager.h"
 
 #include "base/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ skipping 133 matching lines @@
                       &target);
 
     // The registered accelerator is processed.
     const int last_count = target.accelerator_pressed_count();
     EXPECT_TRUE(manager_.Process(accelerator)) << text;
     EXPECT_EQ(last_count + 1, target.accelerator_pressed_count()) << text;
 
     // The non-registered accelerators are not processed.
     accelerator.set_type(ET_UNKNOWN);
     EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-    accelerator.set_type(ET_TRANSLATED_KEY_PRESS);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type

[James Cook, 2015/06/01 22:21:00]

Just curious, why aren't these needed anymore? It seems odd that there's a
KEY_RELEASED but not a KEY_PRESSED.

[Shu Chen, 2015/06/02 04:11:16]

The line 148 is to verify EXPECT_TRUE for KEY_PRESSED.
These lines are to verify EXPECT_FALSE's.

     accelerator.set_type(ET_KEY_RELEASED);
     EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
-    accelerator.set_type(ET_TRANSLATED_KEY_RELEASE);
-    EXPECT_FALSE(manager_.Process(accelerator)) << text;  // different type
 
     EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_UNKNOWN, mask)))
         << text;  // different vkey
     EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_B, mask)))
         << text;  // different vkey
     EXPECT_FALSE(manager_.Process(GetAccelerator(VKEY_SHIFT, mask)))
         << text;  // different vkey
 
     for (int test_mask = 0; test_mask < 2 * 2 * 2; ++test_mask) {
       if (test_mask == mask)
         continue;
       const Accelerator test_accelerator(GetAccelerator(VKEY_A, test_mask));
       const base::string16 test_text = test_accelerator.GetShortcutText();
       EXPECT_FALSE(manager_.Process(test_accelerator))
           << text << ", " << test_text;  // different modifiers
     }
 
     EXPECT_EQ(last_count + 1, target.accelerator_pressed_count()) << text;
     manager_.UnregisterAll(&target);
   }
 }
 
 }  // namespace test
 }  // namespace ui