| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/autocomplete/autocomplete.h" | 5 #include "chrome/browser/autocomplete/autocomplete.h" |
| 6 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 6 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 7 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" | 7 #include "chrome/browser/autocomplete/autocomplete_edit_view.h" |
| 8 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" | 8 #include "chrome/browser/autocomplete/autocomplete_popup_model.h" |
| 9 #include "chrome/browser/browser.h" | 9 #include "chrome/browser/browser.h" |
| 10 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
| 11 #include "chrome/browser/history/history.h" | 11 #include "chrome/browser/history/history.h" |
| 12 #include "chrome/browser/location_bar.h" | 12 #include "chrome/browser/location_bar.h" |
| 13 #include "chrome/browser/profile.h" | 13 #include "chrome/browser/profile.h" |
| 14 #include "chrome/browser/tab_contents/tab_contents.h" | 14 #include "chrome/browser/tab_contents/tab_contents.h" |
| 15 #include "chrome/common/notification_type.h" | 15 #include "chrome/common/notification_type.h" |
| 16 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
| 17 #include "chrome/test/in_process_browser_test.h" | 17 #include "chrome/test/in_process_browser_test.h" |
| 18 #include "chrome/test/ui_test_utils.h" | 18 #include "chrome/test/ui_test_utils.h" |
| 19 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 20 | 20 |
| 21 // Basic test is flaky on Mac | 21 // Basic test is crashy on Mac |
| 22 // http://crbug.com/49324 | 22 // http://crbug.com/49324 |
| 23 #if defined(OS_MAC) | 23 #if defined(OS_MAC) |
| 24 #define MAYBE_Basic FLAKY_Basic | 24 #define MAYBE_Basic DISABLED_Basic |
| 25 #else | 25 #else |
| 26 #define MAYBE_Basic Basic | 26 #define MAYBE_Basic Basic |
| 27 #endif | 27 #endif |
| 28 | 28 |
| 29 namespace { | 29 namespace { |
| 30 | 30 |
| 31 std::wstring AutocompleteResultAsString(const AutocompleteResult& result) { | 31 std::wstring AutocompleteResultAsString(const AutocompleteResult& result) { |
| 32 std::wstring output(StringPrintf(L"{%d} ", result.size())); | 32 std::wstring output(StringPrintf(L"{%d} ", result.size())); |
| 33 for (size_t i = 0; i < result.size(); ++i) { | 33 for (size_t i = 0; i < result.size(); ++i) { |
| 34 AutocompleteMatch match = result.match_at(i); | 34 AutocompleteMatch match = result.match_at(i); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 -1, TabStripModel::ADD_SELECTED, NULL, std::string()); | 147 -1, TabStripModel::ADD_SELECTED, NULL, std::string()); |
| 148 ui_test_utils::WaitForNavigation( | 148 ui_test_utils::WaitForNavigation( |
| 149 &browser()->GetSelectedTabContents()->controller()); | 149 &browser()->GetSelectedTabContents()->controller()); |
| 150 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), | 150 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), |
| 151 location_bar->location_entry()->GetText()); | 151 location_bar->location_entry()->GetText()); |
| 152 browser()->CloseTab(); | 152 browser()->CloseTab(); |
| 153 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), | 153 EXPECT_EQ(UTF8ToWide(chrome::kAboutBlankURL), |
| 154 location_bar->location_entry()->GetText()); | 154 location_bar->location_entry()->GetText()); |
| 155 EXPECT_TRUE(location_bar->location_entry()->IsSelectAll()); | 155 EXPECT_TRUE(location_bar->location_entry()->IsSelectAll()); |
| 156 } | 156 } |
| OLD | NEW |