| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/files/file_path.h" | 6 #include "base/files/file_path.h" |
| 7 #include "base/message_loop/message_loop.h" | 7 #include "base/message_loop/message_loop.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/autocomplete/autocomplete_match.h" | 10 #include "chrome/browser/autocomplete/autocomplete_match.h" |
| (...skipping 314 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 325 ASSERT_EQ(GURL(search_string), history_urls[0]); | 325 ASSERT_EQ(GURL(search_string), history_urls[0]); |
| 326 ASSERT_EQ(url, history_urls[1]); | 326 ASSERT_EQ(url, history_urls[1]); |
| 327 | 327 |
| 328 TemplateURLService* service = TemplateURLServiceFactory::GetForProfile( | 328 TemplateURLService* service = TemplateURLServiceFactory::GetForProfile( |
| 329 browser()->profile()); | 329 browser()->profile()); |
| 330 ui_test_utils::WaitForTemplateURLServiceToLoad(service); | 330 ui_test_utils::WaitForTemplateURLServiceToLoad(service); |
| 331 LocationBar* location_bar = browser()->window()->GetLocationBar(); | 331 LocationBar* location_bar = browser()->window()->GetLocationBar(); |
| 332 ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string); | 332 ui_test_utils::SendToOmniboxAndSubmit(location_bar, search_string); |
| 333 OmniboxEditModel* model = location_bar->GetOmniboxView()->model(); | 333 OmniboxEditModel* model = location_bar->GetOmniboxView()->model(); |
| 334 EXPECT_EQ(GURL(search_string), model->CurrentMatch(NULL).destination_url); | 334 EXPECT_EQ(GURL(search_string), model->CurrentMatch(NULL).destination_url); |
| 335 EXPECT_EQ(ASCIIToUTF16(search_string), model->CurrentMatch(NULL).contents); | 335 EXPECT_EQ(base::ASCIIToUTF16(search_string), |
| 336 model->CurrentMatch(NULL).contents); |
| 336 } | 337 } |
| 337 | 338 |
| 338 // This test fails on linux AURA with this change | 339 // This test fails on linux AURA with this change |
| 339 // https://codereview.chromium.org/23903056 | 340 // https://codereview.chromium.org/23903056 |
| 340 // BUG=https://code.google.com/p/chromium/issues/detail?id=295299 | 341 // BUG=https://code.google.com/p/chromium/issues/detail?id=295299 |
| 341 // TODO(ananta). Debug and fix this test. | 342 // TODO(ananta). Debug and fix this test. |
| 342 #if defined(USE_AURA) && defined(OS_LINUX) | 343 #if defined(USE_AURA) && defined(OS_LINUX) |
| 343 #define MAYBE_WindowFeatures DISABLED_WindowFeatures | 344 #define MAYBE_WindowFeatures DISABLED_WindowFeatures |
| 344 #else | 345 #else |
| 345 #define MAYBE_WindowFeatures WindowFeatures | 346 #define MAYBE_WindowFeatures WindowFeatures |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 415 // popups. | 416 // popups. |
| 416 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DenialOfService) { | 417 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, DenialOfService) { |
| 417 GURL url(ui_test_utils::GetTestUrl( | 418 GURL url(ui_test_utils::GetTestUrl( |
| 418 base::FilePath(kTestDir), | 419 base::FilePath(kTestDir), |
| 419 base::FilePath(FILE_PATH_LITERAL("popup-dos.html")))); | 420 base::FilePath(FILE_PATH_LITERAL("popup-dos.html")))); |
| 420 ui_test_utils::NavigateToURL(browser(), url); | 421 ui_test_utils::NavigateToURL(browser(), url); |
| 421 ASSERT_EQ(25, GetBlockedContentsCount()); | 422 ASSERT_EQ(25, GetBlockedContentsCount()); |
| 422 } | 423 } |
| 423 | 424 |
| 424 } // namespace | 425 } // namespace |
| OLD | NEW |