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 "chrome/browser/extensions/extension_apitest.h" | 5 #include "chrome/browser/extensions/extension_apitest.h" |
6 | 6 |
7 #include "chrome/browser/prefs/pref_service.h" | 7 #include "chrome/browser/prefs/pref_service.h" |
8 #include "chrome/browser/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/common/pref_names.h" | 10 #include "chrome/common/pref_names.h" |
11 | 11 |
12 // Possible race in ChromeURLDataManager. http://crbug.com/59198 | 12 // Possible race in ChromeURLDataManager. http://crbug.com/59198 |
13 #if defined(OS_MACOSX) || defined(OS_LINUX) | 13 #if defined(OS_MACOSX) || defined(OS_LINUX) |
14 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved | 14 #define MAYBE_TabOnRemoved DISABLED_TabOnRemoved |
15 #else | 15 #else |
16 #define MAYBE_TabOnRemoved TabOnRemoved | 16 #define MAYBE_TabOnRemoved TabOnRemoved |
17 #endif | 17 #endif |
18 | 18 |
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTabPng) { | 80 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, CaptureVisibleTabPng) { |
81 ASSERT_TRUE(StartTestServer()); | 81 ASSERT_TRUE(StartTestServer()); |
82 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", | 82 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", |
83 "test_png.html")) << message_; | 83 "test_png.html")) << message_; |
84 } | 84 } |
85 | 85 |
86 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { | 86 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { |
87 ASSERT_TRUE(StartTestServer()); | 87 ASSERT_TRUE(StartTestServer()); |
88 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; | 88 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; |
89 } | 89 } |
OLD | NEW |