| 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/logging.h" | 5 #include "base/logging.h" |
| 6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
| 7 #include "chrome/browser/extensions/extension_toolbar_model.h" | 7 #include "chrome/browser/extensions/extension_toolbar_model.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/test/base/ui_test_utils.h" | 9 #include "chrome/test/base/ui_test_utils.h" |
| 10 #include "extensions/common/extension.h" | 10 #include "extensions/common/extension.h" |
| 11 #include "net/test/embedded_test_server/embedded_test_server.h" | 11 #include "net/test/embedded_test_server/embedded_test_server.h" |
| 12 | 12 |
| 13 namespace extensions { | 13 namespace extensions { |
| 14 namespace { | 14 namespace { |
| 15 | 15 |
| 16 // Times out on win asan, http://crbug.com/166026 | 16 // Times out on win syzyasan, http://crbug.com/166026 |
| 17 #if defined(OS_WIN) && defined(ADDRESS_SANITIZER) | 17 #if defined(SYZYASAN) |
| 18 #define MAYBE_ActiveTab DISABLED_ActiveTab | 18 #define MAYBE_ActiveTab DISABLED_ActiveTab |
| 19 #else | 19 #else |
| 20 #define MAYBE_ActiveTab ActiveTab | 20 #define MAYBE_ActiveTab ActiveTab |
| 21 #endif | 21 #endif |
| 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ActiveTab) { | 22 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_ActiveTab) { |
| 23 ASSERT_TRUE(StartEmbeddedTestServer()); | 23 ASSERT_TRUE(StartEmbeddedTestServer()); |
| 24 | 24 |
| 25 const Extension* extension = | 25 const Extension* extension = |
| 26 LoadExtension(test_data_dir_.AppendASCII("active_tab")); | 26 LoadExtension(test_data_dir_.AppendASCII("active_tab")); |
| 27 ASSERT_TRUE(extension); | 27 ASSERT_TRUE(extension); |
| (...skipping 24 matching lines...) Expand all Loading... |
| 52 ui_test_utils::NavigateToURL( | 52 ui_test_utils::NavigateToURL( |
| 53 browser(), | 53 browser(), |
| 54 embedded_test_server()->GetURL( | 54 embedded_test_server()->GetURL( |
| 55 "/extensions/api_test/active_tab/final_page.html")); | 55 "/extensions/api_test/active_tab/final_page.html")); |
| 56 EXPECT_TRUE(catcher.GetNextResult()) << message_; | 56 EXPECT_TRUE(catcher.GetNextResult()) << message_; |
| 57 } | 57 } |
| 58 } | 58 } |
| 59 | 59 |
| 60 } // namespace | 60 } // namespace |
| 61 } // namespace extensions | 61 } // namespace extensions |
| OLD | NEW |