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

Side by Side Diff: chrome/browser/apps/web_view_browsertest.cc

Issue 764643002: Remove WebViewKey in rules registry. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits. Created 6 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
« no previous file with comments | « no previous file | chrome/browser/extensions/api/declarative/declarative_apitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/path_service.h" 5 #include "base/path_service.h"
6 #include "base/strings/stringprintf.h" 6 #include "base/strings/stringprintf.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/apps/app_browsertest_util.h" 8 #include "chrome/browser/apps/app_browsertest_util.h"
9 #include "chrome/browser/chrome_content_browser_client.h" 9 #include "chrome/browser/chrome_content_browser_client.h"
10 #include "chrome/browser/prerender/prerender_link_manager.h" 10 #include "chrome/browser/prerender/prerender_link_manager.h"
11 #include "chrome/browser/prerender/prerender_link_manager_factory.h" 11 #include "chrome/browser/prerender/prerender_link_manager_factory.h"
12 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" 13 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
14 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h" 14 #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_uti l.h"
15 #include "chrome/browser/task_manager/task_manager_browsertest_util.h" 15 #include "chrome/browser/task_manager/task_manager_browsertest_util.h"
16 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
17 #include "chrome/browser/ui/browser_dialogs.h" 17 #include "chrome/browser/ui/browser_dialogs.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 18 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/test/base/ui_test_utils.h" 19 #include "chrome/test/base/ui_test_utils.h"
20 #include "content/public/browser/gpu_data_manager.h" 20 #include "content/public/browser/gpu_data_manager.h"
21 #include "content/public/browser/interstitial_page.h" 21 #include "content/public/browser/interstitial_page.h"
22 #include "content/public/browser/interstitial_page_delegate.h" 22 #include "content/public/browser/interstitial_page_delegate.h"
23 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
24 #include "content/public/browser/render_process_host.h" 24 #include "content/public/browser/render_process_host.h"
25 #include "content/public/browser/web_contents_delegate.h" 25 #include "content/public/browser/web_contents_delegate.h"
26 #include "content/public/common/content_switches.h" 26 #include "content/public/common/content_switches.h"
27 #include "content/public/test/browser_test_utils.h" 27 #include "content/public/test/browser_test_utils.h"
28 #include "content/public/test/fake_speech_recognition_manager.h" 28 #include "content/public/test/fake_speech_recognition_manager.h"
29 #include "content/public/test/test_renderer_host.h" 29 #include "content/public/test/test_renderer_host.h"
30 #include "extensions/browser/api/declarative/rules_registry.h"
31 #include "extensions/browser/api/declarative/rules_registry_service.h"
32 #include "extensions/browser/api/declarative/test_rules_registry.h"
33 #include "extensions/browser/api/declarative_webrequest/webrequest_constants.h"
30 #include "extensions/browser/app_window/native_app_window.h" 34 #include "extensions/browser/app_window/native_app_window.h"
31 #include "extensions/browser/guest_view/guest_view_manager.h" 35 #include "extensions/browser/guest_view/guest_view_manager.h"
32 #include "extensions/browser/guest_view/guest_view_manager_factory.h" 36 #include "extensions/browser/guest_view/guest_view_manager_factory.h"
33 #include "extensions/browser/guest_view/test_guest_view_manager.h" 37 #include "extensions/browser/guest_view/test_guest_view_manager.h"
38 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
34 #include "extensions/common/extension.h" 39 #include "extensions/common/extension.h"
35 #include "extensions/common/extensions_client.h" 40 #include "extensions/common/extensions_client.h"
36 #include "extensions/test/extension_test_message_listener.h" 41 #include "extensions/test/extension_test_message_listener.h"
37 #include "media/base/media_switches.h" 42 #include "media/base/media_switches.h"
38 #include "net/test/embedded_test_server/embedded_test_server.h" 43 #include "net/test/embedded_test_server/embedded_test_server.h"
39 #include "net/test/embedded_test_server/http_request.h" 44 #include "net/test/embedded_test_server/http_request.h"
40 #include "net/test/embedded_test_server/http_response.h" 45 #include "net/test/embedded_test_server/http_response.h"
41 #include "ui/gfx/switches.h" 46 #include "ui/gfx/switches.h"
42 #include "ui/gl/gl_switches.h" 47 #include "ui/gl/gl_switches.h"
43 48
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 117
113 bool hidden_observed() { return hidden_observed_; } 118 bool hidden_observed() { return hidden_observed_; }
114 119
115 private: 120 private:
116 base::Closure hidden_callback_; 121 base::Closure hidden_callback_;
117 bool hidden_observed_; 122 bool hidden_observed_;
118 123
119 DISALLOW_COPY_AND_ASSIGN(WebContentsHiddenObserver); 124 DISALLOW_COPY_AND_ASSIGN(WebContentsHiddenObserver);
120 }; 125 };
121 126
127 class EmbedderWebContentsObserver : public content::WebContentsObserver {
128 public:
129 EmbedderWebContentsObserver(content:: WebContents* web_contents)
130 : WebContentsObserver(web_contents),
131 terminated_(false) {
132 }
133
134 // WebContentsObserver.
135 void RenderProcessGone(base::TerminationStatus status) override {
136 terminated_ = true;
137 if (message_loop_runner_.get())
138 message_loop_runner_->Quit();
139 }
140
141 void WaitForEmbedderRenderProcessTerminate() {
142 if (terminated_)
143 return;
144 message_loop_runner_ = new content::MessageLoopRunner;
145 message_loop_runner_->Run();
146 }
147
148 private:
149 bool terminated_;
150 scoped_refptr<content::MessageLoopRunner> message_loop_runner_;
151
152 DISALLOW_COPY_AND_ASSIGN(EmbedderWebContentsObserver);
153 };
154
122 void ExecuteScriptWaitForTitle(content::WebContents* web_contents, 155 void ExecuteScriptWaitForTitle(content::WebContents* web_contents,
123 const char* script, 156 const char* script,
124 const char* title) { 157 const char* title) {
125 base::string16 expected_title(base::ASCIIToUTF16(title)); 158 base::string16 expected_title(base::ASCIIToUTF16(title));
126 base::string16 error_title(base::ASCIIToUTF16("error")); 159 base::string16 error_title(base::ASCIIToUTF16("error"));
127 160
128 content::TitleWatcher title_watcher(web_contents, expected_title); 161 content::TitleWatcher title_watcher(web_contents, expected_title);
129 title_watcher.AlsoWaitForTitle(error_title); 162 title_watcher.AlsoWaitForTitle(error_title);
130 EXPECT_TRUE(content::ExecuteScript(web_contents, script)); 163 EXPECT_TRUE(content::ExecuteScript(web_contents, script));
131 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle()); 164 EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
(...skipping 2156 matching lines...) Expand 10 before | Expand all | Expand 10 after
2288 } 2321 }
2289 2322
2290 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) { 2323 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestFindAPI_findupdate) {
2291 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER); 2324 TestHelper("testFindAPI_findupdate", "web_view/shim", NO_TEST_SERVER);
2292 } 2325 }
2293 2326
2294 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadDataAPI) { 2327 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_TestLoadDataAPI) {
2295 TestHelper("testLoadDataAPI", "web_view/shim", NEEDS_TEST_SERVER); 2328 TestHelper("testLoadDataAPI", "web_view/shim", NEEDS_TEST_SERVER);
2296 } 2329 }
2297 2330
2331 // This test verify that the set of rules registries of a webview will be
2332 // removed from RulesRegistryService after the webview is gone.
2333 IN_PROC_BROWSER_TEST_F(WebViewTest,
2334 Shim_TestRulesRegistryIDAreRemovedAfterWebViewIsGone) {
2335 LoadAppWithGuest("web_view/rules_registry");
2336
2337 content::WebContents* embedder_web_contents = GetEmbedderWebContents();
2338 ASSERT_TRUE(embedder_web_contents);
2339 scoped_ptr<EmbedderWebContentsObserver> observer(
2340 new EmbedderWebContentsObserver(embedder_web_contents));
2341
2342 content::WebContents* guest_web_contents = GetGuestWebContents();
2343 ASSERT_TRUE(guest_web_contents);
2344 extensions::WebViewGuest* guest =
2345 extensions::WebViewGuest::FromWebContents(guest_web_contents);
2346 ASSERT_TRUE(guest);
2347
2348 // Register rule for the guest.
2349 Profile* profile = browser()->profile();
2350 int rules_registry_id =
2351 extensions::WebViewGuest::GetOrGenerateRulesRegistryID(
2352 guest->owner_render_process_id(),
2353 guest->view_instance_id(),
2354 profile);
2355
2356 extensions::RulesRegistryService* registry_service =
2357 extensions::RulesRegistryService::Get(profile);
2358 extensions::TestRulesRegistry* rules_registry =
2359 new extensions::TestRulesRegistry(
2360 content::BrowserThread::UI, "ui", rules_registry_id);
2361 registry_service->RegisterRulesRegistry(make_scoped_refptr(rules_registry));
2362
2363 EXPECT_TRUE(registry_service->GetRulesRegistry(
2364 rules_registry_id, "ui").get());
2365
2366 // Kill the embedder's render process, so the webview will go as well.
2367 content::RenderProcessHost* host =
2368 embedder_web_contents->GetRenderProcessHost();
2369 base::KillProcess(host->GetHandle(), 0, false);
2370 observer->WaitForEmbedderRenderProcessTerminate();
2371
2372 EXPECT_FALSE(registry_service->GetRulesRegistry(
2373 rules_registry_id, "ui").get());
2374 }
2375
2376 IN_PROC_BROWSER_TEST_F(WebViewTest, Shim_WebViewWebRequestRegistryHasNoCache) {
2377 LoadAppWithGuest("web_view/rules_registry");
2378
2379 content::WebContents* guest_web_contents = GetGuestWebContents();
2380 ASSERT_TRUE(guest_web_contents);
2381 extensions::WebViewGuest* guest =
2382 extensions::WebViewGuest::FromWebContents(guest_web_contents);
2383 ASSERT_TRUE(guest);
2384
2385 Profile* profile = browser()->profile();
2386 extensions::RulesRegistryService* registry_service =
2387 extensions::RulesRegistryService::Get(profile);
2388 int rules_registry_id =
2389 extensions::WebViewGuest::GetOrGenerateRulesRegistryID(
2390 guest->owner_render_process_id(),
2391 guest->view_instance_id(),
2392 profile);
2393
2394 // Get an existing registered rule for the guest.
2395 extensions::RulesRegistry* registry =
2396 registry_service->GetRulesRegistry(
2397 rules_registry_id,
2398 extensions::declarative_webrequest_constants::kOnRequest).get();
2399
2400 EXPECT_TRUE(registry);
2401 EXPECT_FALSE(registry->rules_cache_delegate_for_testing());
2402 }
2403
2298 // <webview> screenshot capture fails with ubercomp. 2404 // <webview> screenshot capture fails with ubercomp.
2299 // See http://crbug.com/327035. 2405 // See http://crbug.com/327035.
2300 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest, 2406 IN_PROC_BROWSER_TEST_F(WebViewCaptureTest,
2301 DISABLED_Shim_ScreenshotCapture) { 2407 DISABLED_Shim_ScreenshotCapture) {
2302 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER); 2408 TestHelper("testScreenshotCapture", "web_view/shim", NO_TEST_SERVER);
2303 } 2409 }
2304 2410
2305 #if defined(OS_WIN) 2411 #if defined(OS_WIN)
2306 // Test is disabled on Windows because it times out often. 2412 // Test is disabled on Windows because it times out often.
2307 // http://crbug.com/403325 2413 // http://crbug.com/403325
2308 #define MAYBE_WebViewInBackgroundPage \ 2414 #define MAYBE_WebViewInBackgroundPage \
2309 DISABLED_WebViewInBackgroundPage 2415 DISABLED_WebViewInBackgroundPage
2310 #else 2416 #else
2311 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage 2417 #define MAYBE_WebViewInBackgroundPage WebViewInBackgroundPage
2312 #endif 2418 #endif
2313 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) { 2419 IN_PROC_BROWSER_TEST_F(WebViewTest, MAYBE_WebViewInBackgroundPage) {
2314 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background")) 2420 ASSERT_TRUE(RunExtensionTest("platform_apps/web_view/background"))
2315 << message_; 2421 << message_;
2316 } 2422 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/declarative/declarative_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698