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

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

Issue 11664013: GTTF: No more FLAKY_ . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 | Annotate | Revision Log
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 "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/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/browser_tabstrip.h" 8 #include "chrome/browser/ui/browser_tabstrip.h"
9 #include "chrome/common/chrome_switches.h" 9 #include "chrome/common/chrome_switches.h"
10 #include "chrome/test/base/ui_test_utils.h" 10 #include "chrome/test/base/ui_test_utils.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 // resources from. 259 // resources from.
260 ASSERT_TRUE(LoadExtension(test_data_dir_ 260 ASSERT_TRUE(LoadExtension(test_data_dir_
261 .AppendASCII("extension_resource_request_policy") 261 .AppendASCII("extension_resource_request_policy")
262 .AppendASCII("inaccessible"))); 262 .AppendASCII("inaccessible")));
263 EXPECT_TRUE(RunExtensionSubtest( 263 EXPECT_TRUE(RunExtensionSubtest(
264 "extension_resource_request_policy/web_accessible", 264 "extension_resource_request_policy/web_accessible",
265 "iframe.html")) << message_; 265 "iframe.html")) << message_;
266 } 266 }
267 267
268 #if defined(OS_MACOSX) 268 #if defined(OS_MACOSX)
269 #define MAYBE_ExtensionAccessibleResources FLAKY_ExtensionAccessibleResources 269 #define MAYBE_ExtensionAccessibleResources DISABLED_ExtensionAccessibleResources
270 #else 270 #else
271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources 271 #define MAYBE_ExtensionAccessibleResources ExtensionAccessibleResources
272 #endif 272 #endif
273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest, 273 IN_PROC_BROWSER_TEST_F(ExtensionResourceRequestPolicyTest,
274 MAYBE_ExtensionAccessibleResources) { 274 MAYBE_ExtensionAccessibleResources) {
275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_; 275 ASSERT_TRUE(RunExtensionSubtest("accessible_cer", "main.html")) << message_;
276 } 276 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698