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

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

Issue 11747025: Run the JSON Schema Compiler's bundle compilation on JSON files. Previously it (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: restore missing registrations Created 7 years, 11 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 | 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/utf_string_conversions.h" 5 #include "base/utf_string_conversions.h"
6 #include "chrome/browser/extensions/api/permissions/permissions_api.h" 6 #include "chrome/browser/extensions/api/permissions/permissions_api.h"
7 #include "chrome/browser/extensions/extension_apitest.h" 7 #include "chrome/browser/extensions/extension_apitest.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_tabstrip.h" 10 #include "chrome/browser/ui/browser_tabstrip.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 // Navigate to an extension page that will fire the event events.js is 158 // Navigate to an extension page that will fire the event events.js is
159 // listening for. 159 // listening for.
160 ui_test_utils::NavigateToURLWithDisposition( 160 ui_test_utils::NavigateToURLWithDisposition(
161 browser(), extension->GetResourceURL("fire_event.html"), 161 browser(), extension->GetResourceURL("fire_event.html"),
162 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE); 162 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_NONE);
163 EXPECT_TRUE(catcher.GetNextResult()); 163 EXPECT_TRUE(catcher.GetNextResult());
164 } 164 }
165 165
166 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptPermissionsApi) { 166 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptPermissionsApi) {
167 RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); 167 PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);
168 RequestPermissionsFunction::SetAutoConfirmForTests(true); 168 PermissionsRequestFunction::SetAutoConfirmForTests(true);
169 host_resolver()->AddRule("*.com", "127.0.0.1"); 169 host_resolver()->AddRule("*.com", "127.0.0.1");
170 ASSERT_TRUE(StartTestServer()); 170 ASSERT_TRUE(StartTestServer());
171 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_; 171 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_;
172 } 172 }
173 173
174 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) { 174 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) {
175 ASSERT_TRUE(StartTestServer()); 175 ASSERT_TRUE(StartTestServer());
176 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_; 176 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_;
177 } 177 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698