Index: chrome/chrome_tests.gypi |
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
index e6bffc2f797d86525f0eba4ec2872aacdeb9d655..11b1373965469202319d519f7e4d70ea414d3f79 100644 |
--- a/chrome/chrome_tests.gypi |
+++ b/chrome/chrome_tests.gypi |
@@ -97,6 +97,8 @@ |
'browser/chromeos/cryptohome/mock_async_method_caller.h', |
'browser/chromeos/input_method/mock_candidate_window.cc', |
'browser/chromeos/input_method/mock_candidate_window.h', |
+ 'browser/chromeos/input_method/mock_input_method_manager.cc', |
+ 'browser/chromeos/input_method/mock_input_method_manager.h', |
'browser/chromeos/input_method/mock_xkeyboard.cc', |
'browser/chromeos/input_method/mock_xkeyboard.h', |
'browser/chromeos/login/mock_login_status_consumer.cc', |
@@ -1289,9 +1291,15 @@ |
'browser/chromeos/gdata/mock_gdata_sync_client.h', |
'browser/chromeos/gview_request_interceptor_unittest.cc', |
'browser/chromeos/imageburner/burn_manager_unittest.cc', |
+ 'browser/chromeos/input_method/browser_state_monitor_unittest.cc', |
'browser/chromeos/input_method/candidate_window_view_unittest.cc', |
+ 'browser/chromeos/input_method/ibus_controller_base_unittest.cc', |
+ 'browser/chromeos/input_method/ibus_controller_impl_unittest.cc', |
+ 'browser/chromeos/input_method/ibus_controller_unittest.cc', |
'browser/chromeos/input_method/ibus_ui_controller_unittest.cc', |
'browser/chromeos/input_method/input_method_descriptor_unittest.cc', |
+ 'browser/chromeos/input_method/input_method_manager_impl_unittest.cc', |
+ 'browser/chromeos/input_method/input_method_manager_unittest.cc', |
'browser/chromeos/input_method/input_method_property_unittest.cc', |
'browser/chromeos/input_method/input_method_util_unittest.cc', |
'browser/chromeos/input_method/input_method_whitelist_unittest.cc', |
@@ -1320,6 +1328,7 @@ |
'browser/chromeos/mobile_config_unittest.cc', |
'browser/chromeos/network_message_observer_unittest.cc', |
'browser/chromeos/offline/offline_load_page_unittest.cc', |
+ 'browser/chromeos/preferences_unittest.cc', |
'browser/chromeos/process_proxy/process_output_watcher_unittest.cc', |
'browser/chromeos/proxy_config_service_impl_unittest.cc', |
'browser/chromeos/status/network_menu_icon.cc', |
@@ -2237,6 +2246,7 @@ |
}], |
['use_virtual_keyboard!=1', { |
'sources/': [ |
+ ['exclude', '^browser/chromeos/input_method/virtual_keyboard_selector_unittest.cc'], |
['exclude', '^browser/ui/webui/options2/chromeos/virtual_keyboard_manager_handler2_unittest.cc'], |
], |
}], |
@@ -2721,7 +2731,6 @@ |
'browser/chromeos/extensions/echo_private_apitest.cc', |
'browser/chromeos/extensions/external_filesystem_apitest.cc', |
'browser/chromeos/gdata/gdata_documents_service_browsertest.cc', |
- 'browser/chromeos/input_method/input_method_manager_browsertest.cc', |
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.cc', |
'browser/chromeos/kiosk_mode/mock_kiosk_mode_settings.h', |
'browser/chromeos/login/enrollment/enterprise_enrollment_screen_browsertest.cc', |