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

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

Issue 8662010: Rename chrome.experimental.webRequest to chrome.webRequest and chrome.webRequestBlocking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Regenerated documentation Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/extension_apitest.h" 6 #include "chrome/browser/extensions/extension_apitest.h"
7 #include "chrome/browser/extensions/extension_service.h" 7 #include "chrome/browser/extensions/extension_service.h"
8 #include "chrome/browser/extensions/extension_webrequest_api.h" 8 #include "chrome/browser/extensions/extension_webrequest_api.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"
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 class ExtensionWebRequestApiTest : public ExtensionApiTest { 50 class ExtensionWebRequestApiTest : public ExtensionApiTest {
51 public: 51 public:
52 virtual void SetUpInProcessBrowserTestFixture() { 52 virtual void SetUpInProcessBrowserTestFixture() {
53 ExtensionApiTest::SetUpInProcessBrowserTestFixture(); 53 ExtensionApiTest::SetUpInProcessBrowserTestFixture();
54 host_resolver()->AddRule("*", "127.0.0.1"); 54 host_resolver()->AddRule("*", "127.0.0.1");
55 ASSERT_TRUE(StartTestServer()); 55 ASSERT_TRUE(StartTestServer());
56 } 56 }
57 }; 57 };
58 58
59 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestApi) { 59 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestApi) {
60 CommandLine::ForCurrentProcess()->AppendSwitch(
61 switches::kEnableExperimentalExtensionApis);
62
63 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_api.html")) << message_; 60 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_api.html")) << message_;
64 } 61 }
65 62
66 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) { 63 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestSimple) {
67 CommandLine::ForCurrentProcess()->AppendSwitch(
68 switches::kEnableExperimentalExtensionApis);
69
70 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) << 64 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_simple.html")) <<
71 message_; 65 message_;
72 } 66 }
73 67
74 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) { 68 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestComplex) {
75 CommandLine::ForCurrentProcess()->AppendSwitch(
76 switches::kEnableExperimentalExtensionApis);
77
78 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) << 69 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_complex.html")) <<
79 message_; 70 message_;
80 } 71 }
81 72
82 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) { 73 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestAuthRequired) {
83 CommandLine::ForCurrentProcess()->AppendSwitch(
84 switches::kEnableExperimentalExtensionApis);
85
86 CancelLoginDialog login_dialog_helper; 74 CancelLoginDialog login_dialog_helper;
87 75
88 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) << 76 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_auth_required.html")) <<
89 message_; 77 message_;
90 } 78 }
91 79
92 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, 80 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest,
93 WebRequestBlocking) { 81 WebRequestBlocking) {
94 CommandLine::ForCurrentProcess()->AppendSwitch(
95 switches::kEnableExperimentalExtensionApis);
96
97 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) << 82 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_blocking.html")) <<
98 message_; 83 message_;
99 } 84 }
100 85
101 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { 86 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) {
102 CommandLine::ForCurrentProcess()->AppendSwitch(
103 switches::kEnableExperimentalExtensionApis);
104
105 // Wait for the extension to set itself up and return control to us. 87 // Wait for the extension to set itself up and return control to us.
106 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html")) 88 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html"))
107 << message_; 89 << message_;
108 90
109 TabContents* tab = browser()->GetSelectedTabContents(); 91 TabContents* tab = browser()->GetSelectedTabContents();
110 ui_test_utils::WaitForLoadStop(tab); 92 ui_test_utils::WaitForLoadStop(tab);
111 93
112 ResultCatcher catcher; 94 ResultCatcher catcher;
113 95
114 ExtensionService* service = browser()->profile()->GetExtensionService(); 96 ExtensionService* service = browser()->profile()->GetExtensionService();
(...skipping 10 matching lines...) Expand all
125 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft; 107 mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
126 mouse_event.x = 7; 108 mouse_event.x = 7;
127 mouse_event.y = 7; 109 mouse_event.y = 7;
128 mouse_event.clickCount = 1; 110 mouse_event.clickCount = 1;
129 tab->render_view_host()->ForwardMouseEvent(mouse_event); 111 tab->render_view_host()->ForwardMouseEvent(mouse_event);
130 mouse_event.type = WebKit::WebInputEvent::MouseUp; 112 mouse_event.type = WebKit::WebInputEvent::MouseUp;
131 tab->render_view_host()->ForwardMouseEvent(mouse_event); 113 tab->render_view_host()->ForwardMouseEvent(mouse_event);
132 114
133 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message(); 115 ASSERT_TRUE(catcher.GetNextResult()) << catcher.message();
134 } 116 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_webrequest_api_constants.cc ('k') | chrome/common/extensions/api/extension_api.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698