| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/strings/utf_string_conversions.h" | 8 #include "base/strings/utf_string_conversions.h" |
| 9 #include "chrome/browser/chrome_content_browser_client.h" | 9 #include "chrome/browser/chrome_content_browser_client.h" |
| 10 #include "chrome/browser/ui/browser.h" | 10 #include "chrome/browser/ui/browser.h" |
| (...skipping 1265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1276 | 1276 |
| 1277 private: | 1277 private: |
| 1278 std::vector<scoped_refptr<content::TestTextInputClientMessageFilter>> | 1278 std::vector<scoped_refptr<content::TestTextInputClientMessageFilter>> |
| 1279 filters_; | 1279 filters_; |
| 1280 | 1280 |
| 1281 DISALLOW_COPY_AND_ASSIGN(TestBrowserClient); | 1281 DISALLOW_COPY_AND_ASSIGN(TestBrowserClient); |
| 1282 }; | 1282 }; |
| 1283 | 1283 |
| 1284 // This test verifies that requests for dictionary lookup based on selection | 1284 // This test verifies that requests for dictionary lookup based on selection |
| 1285 // range are routed to the focused RenderWidgetHost. | 1285 // range are routed to the focused RenderWidgetHost. |
| 1286 // Test is flaky: http://crbug.com/710842 |
| 1286 IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, | 1287 IN_PROC_BROWSER_TEST_F(SitePerProcessTextInputManagerTest, |
| 1287 LookUpStringForRangeRoutesToFocusedWidget) { | 1288 DISABLED_LookUpStringForRangeRoutesToFocusedWidget) { |
| 1288 // TestBrowserClient needs to replace the ChromeContenBrowserClient after most | 1289 // TestBrowserClient needs to replace the ChromeContenBrowserClient after most |
| 1289 // things are initialized but before the WebContents is created. Here we make | 1290 // things are initialized but before the WebContents is created. Here we make |
| 1290 // that happen by creating a new WebContents in a new tab. But before the test | 1291 // that happen by creating a new WebContents in a new tab. But before the test |
| 1291 // exits, we must destroy the contents and replace the old | 1292 // exits, we must destroy the contents and replace the old |
| 1292 // ContentBrowserClient because the original WebContents and the new one have | 1293 // ContentBrowserClient because the original WebContents and the new one have |
| 1293 // been initialized with the original ContentBrowserClient and the new | 1294 // been initialized with the original ContentBrowserClient and the new |
| 1294 // TestBrowserClient, respectively. | 1295 // TestBrowserClient, respectively. |
| 1295 TestBrowserClient browser_client; | 1296 TestBrowserClient browser_client; |
| 1296 content::ContentBrowserClient* old_browser_client = | 1297 content::ContentBrowserClient* old_browser_client = |
| 1297 content::SetBrowserClientForTesting(&browser_client); | 1298 content::SetBrowserClientForTesting(&browser_client); |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1366 | 1367 |
| 1367 // Closing this WebContents while we still hold on to our TestBrowserClient. | 1368 // Closing this WebContents while we still hold on to our TestBrowserClient. |
| 1368 EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt( | 1369 EXPECT_TRUE(browser()->tab_strip_model()->CloseWebContentsAt( |
| 1369 1, TabStripModel::CLOSE_USER_GESTURE)); | 1370 1, TabStripModel::CLOSE_USER_GESTURE)); |
| 1370 | 1371 |
| 1371 // For the cleanup of the original WebContents in tab index 0. | 1372 // For the cleanup of the original WebContents in tab index 0. |
| 1372 content::SetBrowserClientForTesting(old_browser_client); | 1373 content::SetBrowserClientForTesting(old_browser_client); |
| 1373 } | 1374 } |
| 1374 #endif // defined(MAC_OSX) | 1375 #endif // defined(MAC_OSX) |
| 1375 #endif // !defined(OS_ANDROID) | 1376 #endif // !defined(OS_ANDROID) |
| OLD | NEW |