| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/string_util.h" | 5 #include "base/string_util.h" |
| 6 #include "base/test/test_timeouts.h" | 6 #include "base/test/test_timeouts.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
| 9 #include "chrome/common/url_constants.h" | 9 #include "chrome/common/url_constants.h" |
| 10 #include "chrome/test/automation/automation_proxy.h" | 10 #include "chrome/test/automation/automation_proxy.h" |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 120 net::UnescapeRule::NORMAL | net::UnescapeRule::SPACES | | 120 net::UnescapeRule::NORMAL | net::UnescapeRule::SPACES | |
| 121 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::CONTROL_CHARS); | 121 net::UnescapeRule::URL_SPECIAL_CHARS | net::UnescapeRule::CONTROL_CHARS); |
| 122 value += "\n"; | 122 value += "\n"; |
| 123 ReplaceSubstringsAfterOffset(&value, 0, "\r", ""); | 123 ReplaceSubstringsAfterOffset(&value, 0, "\r", ""); |
| 124 EXPECT_STREQ("1\n", value.c_str()); | 124 EXPECT_STREQ("1\n", value.c_str()); |
| 125 EXPECT_TRUE(data.tab->Close(true)); | 125 EXPECT_TRUE(data.tab->Close(true)); |
| 126 } | 126 } |
| 127 | 127 |
| 128 // Flaky on XP debug. http://crbug.com/62777 | 128 // Flaky on XP debug. http://crbug.com/62777 |
| 129 #if defined(OS_WIN) | 129 #if defined(OS_WIN) |
| 130 #define MAYBE_TestIsSearchProviderInstalled FLAKY_TestIsSearchProviderInstalled | 130 #define MAYBE_TestIsSearchProviderInstalled DISABLED_TestIsSearchProviderInstall
ed |
| 131 #else | 131 #else |
| 132 #define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled | 132 #define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled |
| 133 #endif | 133 #endif |
| 134 TEST_F(SearchProviderTest, MAYBE_TestIsSearchProviderInstalled) { | 134 TEST_F(SearchProviderTest, MAYBE_TestIsSearchProviderInstalled) { |
| 135 ASSERT_TRUE(test_server_started_); | 135 ASSERT_TRUE(test_server_started_); |
| 136 | 136 |
| 137 // Use the default search provider, other installed search provider, and | 137 // Use the default search provider, other installed search provider, and |
| 138 // one not installed as well. (Note that yahoo isn't tested because the | 138 // one not installed as well. (Note that yahoo isn't tested because the |
| 139 // its host name varies a lot for different locales unlike Google and Bing, | 139 // its host name varies a lot for different locales unlike Google and Bing, |
| 140 // which would make the test fail depending on the machine's locale.) | 140 // which would make the test fail depending on the machine's locale.) |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 TEST_F(SearchProviderTest, TestIsSearchProviderInstalledWithException) { | 183 TEST_F(SearchProviderTest, TestIsSearchProviderInstalledWithException) { |
| 184 // Change the url for the test page to one that throws an exception when | 184 // Change the url for the test page to one that throws an exception when |
| 185 // toString is called on the argument given to isSearchProviderInstalled. | 185 // toString is called on the argument given to isSearchProviderInstalled. |
| 186 search_provider_test_url_ = test_server_.GetURL( | 186 search_provider_test_url_ = test_server_.GetURL( |
| 187 "files/is_search_provider_installed_with_exception.html"); | 187 "files/is_search_provider_installed_with_exception.html"); |
| 188 | 188 |
| 189 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 189 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 190 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( | 190 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( |
| 191 browser, "www.google.com", "")); | 191 browser, "www.google.com", "")); |
| 192 } | 192 } |
| OLD | NEW |