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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_apitest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: replace missing extension_system include 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
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/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 6 #include "chrome/browser/extensions/api/web_request/web_request_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/extensions/extension_system.h"
9 #include "chrome/browser/extensions/extension_test_message_listener.h" 10 #include "chrome/browser/extensions/extension_test_message_listener.h"
10 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_tabstrip.h" 13 #include "chrome/browser/ui/browser_tabstrip.h"
13 #include "chrome/browser/ui/login/login_prompt.h" 14 #include "chrome/browser/ui/login/login_prompt.h"
14 #include "chrome/common/chrome_notification_types.h" 15 #include "chrome/common/chrome_notification_types.h"
15 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
16 #include "chrome/common/extensions/features/feature.h" 17 #include "chrome/common/extensions/features/feature.h"
17 #include "chrome/test/base/ui_test_utils.h" 18 #include "chrome/test/base/ui_test_utils.h"
18 #include "content/public/browser/notification_registrar.h" 19 #include "content/public/browser/notification_registrar.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) { 112 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, WebRequestNewTab) {
112 // Wait for the extension to set itself up and return control to us. 113 // Wait for the extension to set itself up and return control to us.
113 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html")) 114 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_newTab.html"))
114 << message_; 115 << message_;
115 116
116 WebContents* tab = chrome::GetActiveWebContents(browser()); 117 WebContents* tab = chrome::GetActiveWebContents(browser());
117 content::WaitForLoadStop(tab); 118 content::WaitForLoadStop(tab);
118 119
119 ResultCatcher catcher; 120 ResultCatcher catcher;
120 121
121 ExtensionService* service = browser()->profile()->GetExtensionService(); 122 ExtensionService* service = extensions::ExtensionSystem::Get(
123 browser()->profile())->extension_service();
122 const extensions::Extension* extension = 124 const extensions::Extension* extension =
123 service->GetExtensionById(last_loaded_extension_id_, false); 125 service->GetExtensionById(last_loaded_extension_id_, false);
124 GURL url = extension->GetResourceURL("newTab/a.html"); 126 GURL url = extension->GetResourceURL("newTab/a.html");
125 127
126 ui_test_utils::NavigateToURL(browser(), url); 128 ui_test_utils::NavigateToURL(browser(), url);
127 129
128 // There's a link on a.html with target=_blank. Click on it to open it in a 130 // There's a link on a.html with target=_blank. Click on it to open it in a
129 // new tab. 131 // new tab.
130 WebKit::WebMouseEvent mouse_event; 132 WebKit::WebMouseEvent mouse_event;
131 mouse_event.type = WebKit::WebInputEvent::MouseDown; 133 mouse_event.type = WebKit::WebInputEvent::MouseDown;
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 message_; 252 message_;
251 } 253 }
252 254
253 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, PostData2) { 255 IN_PROC_BROWSER_TEST_F(ExtensionWebRequestApiTest, PostData2) {
254 // Request body access is only enabled on dev (and canary). 256 // Request body access is only enabled on dev (and canary).
255 Feature::ScopedCurrentChannel sc(chrome::VersionInfo::CHANNEL_DEV); 257 Feature::ScopedCurrentChannel sc(chrome::VersionInfo::CHANNEL_DEV);
256 // Test HTML form POST data access with the multipart and plaintext encoding. 258 // Test HTML form POST data access with the multipart and plaintext encoding.
257 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post2.html")) << 259 ASSERT_TRUE(RunExtensionSubtest("webrequest", "test_post2.html")) <<
258 message_; 260 message_;
259 } 261 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698