OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/strings/string_util.h" | 6 #include "base/strings/string_util.h" |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 9 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
76 } | 76 } |
77 EXPECT_EQ(base::ASCIIToUTF16("OK"), title); | 77 EXPECT_EQ(base::ASCIIToUTF16("OK"), title); |
78 } | 78 } |
79 | 79 |
80 GURL search_provider_test_url_; | 80 GURL search_provider_test_url_; |
81 | 81 |
82 private: | 82 private: |
83 DISALLOW_COPY_AND_ASSIGN(SearchProviderTest); | 83 DISALLOW_COPY_AND_ASSIGN(SearchProviderTest); |
84 }; | 84 }; |
85 | 85 |
86 #if defined(OS_WIN) | 86 #if 1 |
| 87 // Disabled - http://crbug.com/359727 (js has syntax errors which v8 hates) |
| 88 #define MAYBE_TestIsSearchProviderInstalled \ |
| 89 DISABLED_TestIsSearchProviderInstalled |
| 90 #elif defined(OS_WIN) |
87 // This is flaking on XP. See http://crbug.com/159530 | 91 // This is flaking on XP. See http://crbug.com/159530 |
88 #define MAYBE_TestIsSearchProviderInstalled \ | 92 #define MAYBE_TestIsSearchProviderInstalled \ |
89 DISABLED_TestIsSearchProviderInstalled | 93 DISABLED_TestIsSearchProviderInstalled |
90 #else | 94 #else |
91 #define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled | 95 #define MAYBE_TestIsSearchProviderInstalled TestIsSearchProviderInstalled |
92 #endif | 96 #endif |
93 IN_PROC_BROWSER_TEST_F(SearchProviderTest, | 97 IN_PROC_BROWSER_TEST_F(SearchProviderTest, |
94 MAYBE_TestIsSearchProviderInstalled) { | 98 MAYBE_TestIsSearchProviderInstalled) { |
95 // Use the default search provider, other installed search provider, and | 99 // Use the default search provider, other installed search provider, and |
96 // one not installed as well. (Note that yahoo isn't tested because the | 100 // one not installed as well. (Note that yahoo isn't tested because the |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 IN_PROC_BROWSER_TEST_F(SearchProviderTest, | 141 IN_PROC_BROWSER_TEST_F(SearchProviderTest, |
138 TestIsSearchProviderInstalledWithException) { | 142 TestIsSearchProviderInstalledWithException) { |
139 // Change the url for the test page to one that throws an exception when | 143 // Change the url for the test page to one that throws an exception when |
140 // toString is called on the argument given to isSearchProviderInstalled. | 144 // toString is called on the argument given to isSearchProviderInstalled. |
141 search_provider_test_url_ = test_server()->GetURL( | 145 search_provider_test_url_ = test_server()->GetURL( |
142 "files/is_search_provider_installed_with_exception.html"); | 146 "files/is_search_provider_installed_with_exception.html"); |
143 | 147 |
144 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( | 148 FinishIsSearchProviderInstalledTest(StartIsSearchProviderInstalledTest( |
145 browser(), "www.google.com", "")); | 149 browser(), "www.google.com", "")); |
146 } | 150 } |
OLD | NEW |