| 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 "app/l10n_util.h" | 5 #include "app/l10n_util.h" |
| 6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
| 7 #include "base/string16.h" | 7 #include "base/string16.h" |
| 8 #include "base/utf_string_conversions.h" | 8 #include "base/utf_string_conversions.h" |
| 9 #include "chrome/app/chrome_dll_resource.h" | 9 #include "chrome/app/chrome_dll_resource.h" |
| 10 #include "chrome/common/chrome_switches.h" | 10 #include "chrome/common/chrome_switches.h" |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 101 ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms())); | 101 ASSERT_TRUE(browser->WaitForTabToBecomeActive(1, action_max_timeout_ms())); |
| 102 ASSERT_TRUE(browser->GetTabCount(&tab_count)); | 102 ASSERT_TRUE(browser->GetTabCount(&tab_count)); |
| 103 ASSERT_EQ(2, tab_count); | 103 ASSERT_EQ(2, tab_count); |
| 104 } | 104 } |
| 105 | 105 |
| 106 // TODO(csilv): Investigate why this fails (sometimes) on 10.5 and fix. | 106 // TODO(csilv): Investigate why this fails (sometimes) on 10.5 and fix. |
| 107 // http://crbug.com/48521. Also, crashing on linux/views. | 107 // http://crbug.com/48521. Also, crashing on linux/views. |
| 108 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) | 108 #if defined(OS_LINUX) && defined(TOOLKIT_VIEWS) |
| 109 #define MAYBE_TwoCommandsOneTab DISABLED_TwoCommandsOneTab | 109 #define MAYBE_TwoCommandsOneTab DISABLED_TwoCommandsOneTab |
| 110 #else | 110 #else |
| 111 #define MAYBE_TwoComamndsOneTab FLAKY_TwoCommandsOneTab | 111 #define MAYBE_TwoCommandsOneTab FLAKY_TwoCommandsOneTab |
| 112 #endif | 112 #endif |
| 113 | 113 |
| 114 TEST_F(OptionsUITest, MAYBE_TwoCommandsOneTab) { | 114 TEST_F(OptionsUITest, MAYBE_TwoCommandsOneTab) { |
| 115 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); | 115 scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); |
| 116 ASSERT_TRUE(browser.get()); | 116 ASSERT_TRUE(browser.get()); |
| 117 | 117 |
| 118 int tab_count = -1; | 118 int tab_count = -1; |
| 119 ASSERT_TRUE(browser->GetTabCount(&tab_count)); | 119 ASSERT_TRUE(browser->GetTabCount(&tab_count)); |
| 120 ASSERT_EQ(1, tab_count); | 120 ASSERT_EQ(1, tab_count); |
| 121 | 121 |
| 122 ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); | 122 ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); |
| 123 ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); | 123 ASSERT_TRUE(browser->RunCommand(IDC_OPTIONS)); |
| 124 ASSERT_TRUE(browser->GetTabCount(&tab_count)); | 124 ASSERT_TRUE(browser->GetTabCount(&tab_count)); |
| 125 ASSERT_EQ(2, tab_count); | 125 ASSERT_EQ(2, tab_count); |
| 126 } | 126 } |
| 127 | 127 |
| 128 } // namespace | 128 } // namespace |
| OLD | NEW |