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

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

Issue 1628423002: Add frameId to chrome.tabs.executeScript/insertCSS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissiondata-remove-process_id
Patch Set: Nits + comments Created 4 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
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 "build/build_config.h" 5 #include "build/build_config.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "net/dns/mock_host_resolver.h" 7 #include "net/dns/mock_host_resolver.h"
8 8
9 class ExecuteScriptApiTest : public ExtensionApiTest { 9 class ExecuteScriptApiTest : public ExtensionApiTest {
10 protected: 10 protected:
(...skipping 19 matching lines...) Expand all
30 ASSERT_TRUE(RunExtensionTest("../bad")) << message_; 30 ASSERT_TRUE(RunExtensionTest("../bad")) << message_;
31 } 31 }
32 32
33 // If failing, mark disabled and update http://crbug.com/92105. 33 // If failing, mark disabled and update http://crbug.com/92105.
34 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) { 34 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptInFrame) {
35 SetupDelayedHostResolver(); 35 SetupDelayedHostResolver();
36 ASSERT_TRUE(StartEmbeddedTestServer()); 36 ASSERT_TRUE(StartEmbeddedTestServer());
37 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_; 37 ASSERT_TRUE(RunExtensionTest("executescript/in_frame")) << message_;
38 } 38 }
39 39
40 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptByFrameId) {
41 SetupDelayedHostResolver();
42 ASSERT_TRUE(StartEmbeddedTestServer());
43 ASSERT_TRUE(RunExtensionTest("executescript/frame_id")) << message_;
44 }
45
40 // Fails often on Windows. 46 // Fails often on Windows.
41 // http://crbug.com/174715 47 // http://crbug.com/174715
42 #if defined(OS_WIN) 48 #if defined(OS_WIN)
43 #define MAYBE_ExecuteScriptPermissions DISABLED_ExecuteScriptPermissions 49 #define MAYBE_ExecuteScriptPermissions DISABLED_ExecuteScriptPermissions
44 #else 50 #else
45 #define MAYBE_ExecuteScriptPermissions ExecuteScriptPermissions 51 #define MAYBE_ExecuteScriptPermissions ExecuteScriptPermissions
46 #endif // defined(OS_WIN) 52 #endif // defined(OS_WIN)
47 53
48 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptPermissions) { 54 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, MAYBE_ExecuteScriptPermissions) {
49 SetupDelayedHostResolver(); 55 SetupDelayedHostResolver();
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 SetupDelayedHostResolver(); 123 SetupDelayedHostResolver();
118 ASSERT_TRUE(StartEmbeddedTestServer()); 124 ASSERT_TRUE(StartEmbeddedTestServer());
119 ASSERT_TRUE(RunExtensionTest("executescript/subframes_on_load")) << message_; 125 ASSERT_TRUE(RunExtensionTest("executescript/subframes_on_load")) << message_;
120 } 126 }
121 127
122 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, RemovedFrames) { 128 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, RemovedFrames) {
123 SetupDelayedHostResolver(); 129 SetupDelayedHostResolver();
124 ASSERT_TRUE(StartEmbeddedTestServer()); 130 ASSERT_TRUE(StartEmbeddedTestServer());
125 ASSERT_TRUE(RunExtensionTest("executescript/removed_frames")) << message_; 131 ASSERT_TRUE(RunExtensionTest("executescript/removed_frames")) << message_;
126 } 132 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698