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_service.h" | 7 #include "chrome/browser/extensions/extension_service.h" |
8 #include "chrome/browser/extensions/extension_system.h" | 8 #include "chrome/browser/extensions/extension_system.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_tabstrip.h" | |
11 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
12 #include "chrome/test/base/ui_test_utils.h" | 11 #include "chrome/test/base/ui_test_utils.h" |
13 | 12 |
14 namespace extensions { | 13 namespace extensions { |
15 namespace { | 14 namespace { |
16 | 15 |
17 // Times out on win asan, http://crbug.com/166026 | 16 // Times out on win asan, http://crbug.com/166026 |
18 #if defined(OS_WIN) && defined(ADDRESS_SANITIZER) | 17 #if defined(OS_WIN) && defined(ADDRESS_SANITIZER) |
19 #define MAYBE_ActiveTab DISABLED_ActiveTab | 18 #define MAYBE_ActiveTab DISABLED_ActiveTab |
20 #else | 19 #else |
(...skipping 27 matching lines...) Expand all Loading... |
48 { | 47 { |
49 ResultCatcher catcher; | 48 ResultCatcher catcher; |
50 ui_test_utils::NavigateToURL(browser(), | 49 ui_test_utils::NavigateToURL(browser(), |
51 test_server()->GetURL("final_page.html")); | 50 test_server()->GetURL("final_page.html")); |
52 EXPECT_TRUE(catcher.GetNextResult()) << message_; | 51 EXPECT_TRUE(catcher.GetNextResult()) << message_; |
53 } | 52 } |
54 } | 53 } |
55 | 54 |
56 } // namespace | 55 } // namespace |
57 } // namespace extensions | 56 } // namespace extensions |
OLD | NEW |