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

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

Issue 635573005: Cleanup: Better constify some strings in chrome/browser/{chromeos,extensions}. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, nit Created 6 years, 1 month 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 #include "net/dns/mock_host_resolver.h" 6 #include "net/dns/mock_host_resolver.h"
7 7
8 class ExecuteScriptApiTest : public ExtensionApiTest { 8 class ExecuteScriptApiTest : public ExtensionApiTest {
9 protected: 9 protected:
10 void SetupDelayedHostResolver() { 10 void SetupDelayedHostResolver() {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 // If failing, mark disabled and update http://crbug.com/84760. 46 // If failing, mark disabled and update http://crbug.com/84760.
47 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFileAfterClose) { 47 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFileAfterClose) {
48 host_resolver()->AddRule("b.com", "127.0.0.1"); 48 host_resolver()->AddRule("b.com", "127.0.0.1");
49 ASSERT_TRUE(StartEmbeddedTestServer()); 49 ASSERT_TRUE(StartEmbeddedTestServer());
50 ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_; 50 ASSERT_TRUE(RunExtensionTest("executescript/file_after_close")) << message_;
51 } 51 }
52 52
53 // If crashing, mark disabled and update http://crbug.com/67774. 53 // If crashing, mark disabled and update http://crbug.com/67774.
54 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFragmentNavigation) { 54 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, ExecuteScriptFragmentNavigation) {
55 ASSERT_TRUE(StartEmbeddedTestServer()); 55 ASSERT_TRUE(StartEmbeddedTestServer());
56 const char* extension_name = "executescript/fragment"; 56 const char extension_name[] = "executescript/fragment";
57 ASSERT_TRUE(RunExtensionTest(extension_name)) << message_; 57 ASSERT_TRUE(RunExtensionTest(extension_name)) << message_;
58 } 58 }
59 59
60 // Fails often on Windows dbg bots. http://crbug.com/177163 60 // Fails often on Windows dbg bots. http://crbug.com/177163
61 #if defined(OS_WIN) 61 #if defined(OS_WIN)
62 #define MAYBE_NavigationRaceExecuteScript DISABLED_NavigationRaceExecuteScript 62 #define MAYBE_NavigationRaceExecuteScript DISABLED_NavigationRaceExecuteScript
63 #else 63 #else
64 #define MAYBE_NavigationRaceExecuteScript NavigationRaceExecuteScript 64 #define MAYBE_NavigationRaceExecuteScript NavigationRaceExecuteScript
65 #endif // defined(OS_WIN) 65 #endif // defined(OS_WIN)
66 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, 66 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest,
(...skipping 30 matching lines...) Expand all
97 SetupDelayedHostResolver(); 97 SetupDelayedHostResolver();
98 ASSERT_TRUE(StartEmbeddedTestServer()); 98 ASSERT_TRUE(StartEmbeddedTestServer());
99 ASSERT_TRUE(RunExtensionTest("executescript/callback")) << message_; 99 ASSERT_TRUE(RunExtensionTest("executescript/callback")) << message_;
100 } 100 }
101 101
102 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, UserGesture) { 102 IN_PROC_BROWSER_TEST_F(ExecuteScriptApiTest, UserGesture) {
103 SetupDelayedHostResolver(); 103 SetupDelayedHostResolver();
104 ASSERT_TRUE(StartEmbeddedTestServer()); 104 ASSERT_TRUE(StartEmbeddedTestServer());
105 ASSERT_TRUE(RunExtensionTest("executescript/user_gesture")) << message_; 105 ASSERT_TRUE(RunExtensionTest("executescript/user_gesture")) << message_;
106 } 106 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698