Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(39)

Side by Side Diff: chrome/browser/extensions/extension_tabs_apitest.cc

Issue 2847313002: Update some host_resolver()->AddRules in chrome/browser. (Closed)
Patch Set: Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "chrome/browser/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 #include "chrome/browser/prefs/incognito_mode_prefs.h" 8 #include "chrome/browser/prefs/incognito_mode_prefs.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/ui/browser.h" 10 #include "chrome/browser/ui/browser.h"
11 #include "chrome/browser/ui/browser_window.h" 11 #include "chrome/browser/ui/browser_window.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
15 #include "components/prefs/pref_service.h" 15 #include "components/prefs/pref_service.h"
16 #include "net/dns/mock_host_resolver.h" 16 #include "net/dns/mock_host_resolver.h"
17 17
18 #if defined(OS_WIN) 18 #if defined(OS_WIN)
19 #include "ui/aura/window.h" 19 #include "ui/aura/window.h"
20 #include "ui/aura/window_tree_host.h" 20 #include "ui/aura/window_tree_host.h"
21 #endif 21 #endif
22 22
23 class ExtensionApiTabTest : public ExtensionApiTest {
24 public:
25 void SetUpOnMainThread() override {
26 ExtensionApiTest::SetUpOnMainThread();
27 host_resolver()->AddRule("*", "127.0.0.1");
28 ASSERT_TRUE(StartEmbeddedTestServer());
29 }
30 };
31
23 #if defined(USE_AURA) || defined(OS_MACOSX) 32 #if defined(USE_AURA) || defined(OS_MACOSX)
24 // Maximizing/fullscreen popup window doesn't work on aura's managed mode. 33 // Maximizing/fullscreen popup window doesn't work on aura's managed mode.
25 // See bug crbug.com/116305. 34 // See bug crbug.com/116305.
26 // Mac: http://crbug.com/103912 35 // Mac: http://crbug.com/103912
27 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState 36 #define MAYBE_UpdateWindowShowState DISABLED_UpdateWindowShowState
28 #else 37 #else
29 #define MAYBE_UpdateWindowShowState UpdateWindowShowState 38 #define MAYBE_UpdateWindowShowState UpdateWindowShowState
30 #endif // defined(USE_AURA) || defined(OS_MACOSX) 39 #endif // defined(USE_AURA) || defined(OS_MACOSX)
31 40
32 class ExtensionApiNewTabTest : public ExtensionApiTest { 41 class ExtensionApiNewTabTest : public ExtensionApiTabTest {
33 public: 42 public:
34 ExtensionApiNewTabTest() {} 43 ExtensionApiNewTabTest() {}
35 void SetUpCommandLine(base::CommandLine* command_line) override { 44 void SetUpCommandLine(base::CommandLine* command_line) override {
36 ExtensionApiTest::SetUpCommandLine(command_line); 45 ExtensionApiTabTest::SetUpCommandLine(command_line);
37 // Override the default which InProcessBrowserTest adds if it doesn't see a 46 // Override the default which InProcessBrowserTest adds if it doesn't see a
38 // homepage. 47 // homepage.
39 command_line->AppendSwitchASCII( 48 command_line->AppendSwitchASCII(
40 switches::kHomePage, chrome::kChromeUINewTabURL); 49 switches::kHomePage, chrome::kChromeUINewTabURL);
41 } 50 }
42 }; 51 };
43 52
44 IN_PROC_BROWSER_TEST_F(ExtensionApiNewTabTest, Tabs) { 53 IN_PROC_BROWSER_TEST_F(ExtensionApiNewTabTest, Tabs) {
45 // The test creates a tab and checks that the URL of the new tab 54 // The test creates a tab and checks that the URL of the new tab
46 // is that of the new tab page. Make sure the pref that controls 55 // is that of the new tab page. Make sure the pref that controls
47 // this is set. 56 // this is set.
48 browser()->profile()->GetPrefs()->SetBoolean( 57 browser()->profile()->GetPrefs()->SetBoolean(
49 prefs::kHomePageIsNewTabPage, true); 58 prefs::kHomePageIsNewTabPage, true);
50 59
51 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_; 60 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud.html")) << message_;
52 } 61 }
53 62
54 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabAudible) { 63 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabAudible) {
55 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "audible.html")) << message_; 64 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "audible.html")) << message_;
56 } 65 }
57 66
58 // http://crbug.com/521410 67 // http://crbug.com/521410
59 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabMuted) { 68 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabMuted) {
60 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "muted.html")) << message_; 69 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "muted.html")) << message_;
61 } 70 }
62 71
63 // Flaky on windows: http://crbug.com/238667 72 // Flaky on windows: http://crbug.com/238667
64 #if defined(OS_WIN) 73 #if defined(OS_WIN)
65 #define MAYBE_Tabs2 DISABLED_Tabs2 74 #define MAYBE_Tabs2 DISABLED_Tabs2
66 #else 75 #else
67 #define MAYBE_Tabs2 Tabs2 76 #define MAYBE_Tabs2 Tabs2
68 #endif 77 #endif
69 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_Tabs2) { 78 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_Tabs2) {
70 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud2.html")) << message_; 79 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crud2.html")) << message_;
71 } 80 }
72 81
73 // crbug.com/149924 82 // crbug.com/149924
74 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabDuplicate) { 83 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabDuplicate) {
75 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "duplicate.html")) << message_; 84 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "duplicate.html")) << message_;
76 } 85 }
77 86
78 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabSize) { 87 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabSize) {
79 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "tab_size.html")) << message_; 88 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "tab_size.html")) << message_;
80 } 89 }
81 90
82 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabUpdate) { 91 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabUpdate) {
83 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_; 92 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "update.html")) << message_;
84 } 93 }
85 94
86 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabPinned) { 95 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabPinned) {
87 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_; 96 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "pinned.html")) << message_;
88 } 97 }
89 98
90 // Flaky on windows: http://crbug.com/238667 99 // Flaky on windows: http://crbug.com/238667
91 #if defined(OS_WIN) 100 #if defined(OS_WIN)
92 #define MAYBE_TabMove DISABLED_TabMove 101 #define MAYBE_TabMove DISABLED_TabMove
93 #else 102 #else
94 #define MAYBE_TabMove TabMove 103 #define MAYBE_TabMove TabMove
95 #endif 104 #endif
96 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabMove) { 105 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_TabMove) {
97 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_; 106 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "move.html")) << message_;
98 } 107 }
99 108
100 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabEvents) { 109 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabEvents) {
101 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_; 110 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "events.html")) << message_;
102 } 111 }
103 112
104 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabRelativeURLs) { 113 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabRelativeURLs) {
105 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html")) 114 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "relative_urls.html"))
106 << message_; 115 << message_;
107 } 116 }
108 117
109 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabQuery) { 118 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabQuery) {
110 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "query.html")) << message_; 119 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "query.html")) << message_;
111 } 120 }
112 121
113 // Flaky on windows: http://crbug.com/239022 122 // Flaky on windows: http://crbug.com/239022
114 #if defined(OS_WIN) 123 #if defined(OS_WIN)
115 #define MAYBE_TabHighlight DISABLED_TabHighlight 124 #define MAYBE_TabHighlight DISABLED_TabHighlight
116 #else 125 #else
117 #define MAYBE_TabHighlight TabHighlight 126 #define MAYBE_TabHighlight TabHighlight
118 #endif 127 #endif
119 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabHighlight) { 128 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_TabHighlight) {
120 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "highlight.html")) << message_; 129 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "highlight.html")) << message_;
121 } 130 }
122 131
123 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabCrashBrowser) { 132 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabCrashBrowser) {
124 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crash.html")) << message_; 133 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "crash.html")) << message_;
125 } 134 }
126 135
127 // Flaky on windows: http://crbug.com/238667 136 // Flaky on windows: http://crbug.com/238667
128 #if defined(OS_WIN) 137 #if defined(OS_WIN)
129 #define MAYBE_TabOpener DISABLED_TabOpener 138 #define MAYBE_TabOpener DISABLED_TabOpener
130 #else 139 #else
131 #define MAYBE_TabOpener TabOpener 140 #define MAYBE_TabOpener TabOpener
132 #endif 141 #endif
133 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabOpener) { 142 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_TabOpener) {
134 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "opener.html")) << message_; 143 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "opener.html")) << message_;
135 } 144 }
136 145
137 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabGetCurrent) { 146 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabGetCurrent) {
138 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_; 147 ASSERT_TRUE(RunExtensionTest("tabs/get_current")) << message_;
139 } 148 }
140 149
141 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabConnect) { 150 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabConnect) {
142 ASSERT_TRUE(StartEmbeddedTestServer());
143 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_; 151 ASSERT_TRUE(RunExtensionTest("tabs/connect")) << message_;
144 } 152 }
145 153
146 // Possible race in ChromeURLDataManager. http://crbug.com/59198 154 // Possible race in ChromeURLDataManager. http://crbug.com/59198
147 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabOnRemoved) { 155 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabOnRemoved) {
148 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_; 156 ASSERT_TRUE(RunExtensionTest("tabs/on_removed")) << message_;
149 } 157 }
150 158
151 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_TabReload) { 159 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_TabReload) {
152 ASSERT_TRUE(RunExtensionTest("tabs/reload")) << message_; 160 ASSERT_TRUE(RunExtensionTest("tabs/reload")) << message_;
153 } 161 }
154 162
155 class ExtensionApiCaptureTest : public ExtensionApiTest { 163 class ExtensionApiCaptureTest : public ExtensionApiTabTest {
156 public: 164 public:
157 ExtensionApiCaptureTest() {} 165 ExtensionApiCaptureTest() {}
158 166
159 void SetUp() override { 167 void SetUp() override {
160 EnablePixelOutput(); 168 EnablePixelOutput();
161 ExtensionApiTest::SetUp(); 169 ExtensionApiTabTest::SetUp();
162 }
163
164 void SetUpCommandLine(base::CommandLine* command_line) override {
165 ExtensionApiTest::SetUpCommandLine(command_line);
166 } 170 }
167 }; 171 };
168 172
169 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, 173 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
170 DISABLED_CaptureVisibleTabJpeg) { 174 DISABLED_CaptureVisibleTabJpeg) {
171 host_resolver()->AddRule("a.com", "127.0.0.1");
172 host_resolver()->AddRule("b.com", "127.0.0.1");
173 ASSERT_TRUE(StartEmbeddedTestServer());
174 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 175 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
175 "test_jpeg.html")) << message_; 176 "test_jpeg.html")) << message_;
176 } 177 }
177 178
178 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, DISABLED_CaptureVisibleTabPng) { 179 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, DISABLED_CaptureVisibleTabPng) {
179 host_resolver()->AddRule("a.com", "127.0.0.1");
180 host_resolver()->AddRule("b.com", "127.0.0.1");
181 ASSERT_TRUE(StartEmbeddedTestServer());
182 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 180 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
183 "test_png.html")) << message_; 181 "test_png.html")) << message_;
184 } 182 }
185 183
186 // Times out on non-Windows. 184 // Times out on non-Windows.
187 // See http://crbug.com/80212 185 // See http://crbug.com/80212
188 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, 186 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
189 DISABLED_CaptureVisibleTabRace) { 187 DISABLED_CaptureVisibleTabRace) {
190 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 188 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
191 "test_race.html")) << message_; 189 "test_race.html")) << message_;
192 } 190 }
193 191
194 192
195 // Disabled for being flaky, see http://crbug/367695. 193 // Disabled for being flaky, see http://crbug/367695.
196 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, 194 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest,
197 DISABLED_CaptureVisibleFile) { 195 DISABLED_CaptureVisibleFile) {
198 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 196 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
199 "test_file.html")) << message_; 197 "test_file.html")) << message_;
200 } 198 }
201 199
202 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleDisabled) { 200 IN_PROC_BROWSER_TEST_F(ExtensionApiCaptureTest, CaptureVisibleDisabled) {
203 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDisableScreenshots, 201 browser()->profile()->GetPrefs()->SetBoolean(prefs::kDisableScreenshots,
204 true); 202 true);
205 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab", 203 ASSERT_TRUE(RunExtensionSubtest("tabs/capture_visible_tab",
206 "test_disabled.html")) << message_; 204 "test_disabled.html")) << message_;
207 } 205 }
208 206
209 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnCreated) { 207 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabsOnCreated) {
210 ASSERT_TRUE(RunExtensionTest("tabs/on_created")) << message_; 208 ASSERT_TRUE(RunExtensionTest("tabs/on_created")) << message_;
211 } 209 }
212 210
213 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabsOnUpdated) { 211 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabsOnUpdated) {
214 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_; 212 ASSERT_TRUE(RunExtensionTest("tabs/on_updated")) << message_;
215 } 213 }
216 214
217 // Flaky on Linux. http://crbug.com/657376. 215 // Flaky on Linux. http://crbug.com/657376.
218 #if defined(OS_LINUX) 216 #if defined(OS_LINUX)
219 #define MAYBE_TabsNoPermissions DISABLED_TabsNoPermissions 217 #define MAYBE_TabsNoPermissions DISABLED_TabsNoPermissions
220 #else 218 #else
221 #define MAYBE_TabsNoPermissions TabsNoPermissions 219 #define MAYBE_TabsNoPermissions TabsNoPermissions
222 #endif 220 #endif
223 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_TabsNoPermissions) { 221 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_TabsNoPermissions) {
224 host_resolver()->AddRule("a.com", "127.0.0.1");
225 ASSERT_TRUE(StartEmbeddedTestServer());
226 ASSERT_TRUE(RunExtensionTest("tabs/no_permissions")) << message_; 222 ASSERT_TRUE(RunExtensionTest("tabs/no_permissions")) << message_;
227 } 223 }
228 224
229 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, HostPermission) { 225 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, HostPermission) {
230 host_resolver()->AddRule("a.com", "127.0.0.1");
231 ASSERT_TRUE(StartEmbeddedTestServer());
232
233 ASSERT_TRUE(RunExtensionTest("tabs/host_permission")) << message_; 226 ASSERT_TRUE(RunExtensionTest("tabs/host_permission")) << message_;
234 } 227 }
235 228
236 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, UpdateWindowResize) { 229 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, UpdateWindowResize) {
237 ASSERT_TRUE(RunExtensionTest("window_update/resize")) << message_; 230 ASSERT_TRUE(RunExtensionTest("window_update/resize")) << message_;
238 } 231 }
239 232
240 #if defined(OS_WIN) 233 #if defined(OS_WIN)
241 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, FocusWindowDoesNotUnmaximize) { 234 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, FocusWindowDoesNotUnmaximize) {
242 HWND window = 235 HWND window =
243 browser()->window()->GetNativeWindow()->GetHost()->GetAcceleratedWidget(); 236 browser()->window()->GetNativeWindow()->GetHost()->GetAcceleratedWidget();
244 ::SendMessage(window, WM_SYSCOMMAND, SC_MAXIMIZE, 0); 237 ::SendMessage(window, WM_SYSCOMMAND, SC_MAXIMIZE, 0);
245 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_; 238 ASSERT_TRUE(RunExtensionTest("window_update/focus")) << message_;
246 ASSERT_TRUE(::IsZoomed(window)); 239 ASSERT_TRUE(::IsZoomed(window));
247 } 240 }
248 #endif // OS_WIN 241 #endif // OS_WIN
249 242
250 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, MAYBE_UpdateWindowShowState) { 243 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, MAYBE_UpdateWindowShowState) {
251 ASSERT_TRUE(RunExtensionTest("window_update/show_state")) << message_; 244 ASSERT_TRUE(RunExtensionTest("window_update/show_state")) << message_;
252 } 245 }
253 246
254 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, IncognitoDisabledByPref) { 247 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, IncognitoDisabledByPref) {
255 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(), 248 IncognitoModePrefs::SetAvailability(browser()->profile()->GetPrefs(),
256 IncognitoModePrefs::DISABLED); 249 IncognitoModePrefs::DISABLED);
257 250
258 // This makes sure that creating an incognito window fails due to pref 251 // This makes sure that creating an incognito window fails due to pref
259 // (policy) being set. 252 // (policy) being set.
260 ASSERT_TRUE(RunExtensionTest("tabs/incognito_disabled")) << message_; 253 ASSERT_TRUE(RunExtensionTest("tabs/incognito_disabled")) << message_;
261 } 254 }
262 255
263 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedPopup) { 256 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_GetViewsOfCreatedPopup) {
264 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html")) 257 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_popup.html"))
265 << message_; 258 << message_;
266 } 259 }
267 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, DISABLED_GetViewsOfCreatedWindow) { 260 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, DISABLED_GetViewsOfCreatedWindow) {
268 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html")) 261 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "get_views_window.html"))
269 << message_; 262 << message_;
270 } 263 }
271 264
272 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OnUpdatedDiscardedState) { 265 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, OnUpdatedDiscardedState) {
273 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "discarded.html")) << message_; 266 ASSERT_TRUE(RunExtensionSubtest("tabs/basics", "discarded.html")) << message_;
274 } 267 }
275 268
276 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, TabOpenerCraziness) { 269 IN_PROC_BROWSER_TEST_F(ExtensionApiTabTest, TabOpenerCraziness) {
277 ASSERT_TRUE(StartEmbeddedTestServer());
278 ASSERT_TRUE(RunExtensionTest("tabs/tab_opener_id")); 270 ASSERT_TRUE(RunExtensionTest("tabs/tab_opener_id"));
279 } 271 }
280 272
281 // Adding a new test? Awesome. But API tests are the old hotness. The new 273 // Adding a new test? Awesome. But API tests are the old hotness. The new
282 // hotness is extension_function_test_utils. See tabs_test.cc for an example. 274 // hotness is extension_function_test_utils. See tabs_test.cc for an example.
283 // We are trying to phase out many uses of API tests as they tend to be flaky. 275 // We are trying to phase out many uses of API tests as they tend to be flaky.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698