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

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

Issue 2839373003: struct UnloadedExtensionInfo -> enum UnloadedExtensionInfoReason (Closed)
Patch Set: Rebase Created 3 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_browsertest.h" 5 #include "chrome/browser/extensions/extension_browsertest.h"
6 #include "chrome/browser/extensions/extension_service.h" 6 #include "chrome/browser/extensions/extension_service.h"
7 #include "chrome/browser/ui/tabs/tab_strip_model.h" 7 #include "chrome/browser/ui/tabs/tab_strip_model.h"
8 #include "chrome/test/base/ui_test_utils.h" 8 #include "chrome/test/base/ui_test_utils.h"
9 #include "content/public/test/browser_test_utils.h" 9 #include "content/public/test/browser_test_utils.h"
10 10
(...skipping 10 matching lines...) Expand all
21 // process. 21 // process.
22 const Extension* extension = 22 const Extension* extension =
23 LoadExtension(test_data_dir_.AppendASCII("simple_with_file")); 23 LoadExtension(test_data_dir_.AppendASCII("simple_with_file"));
24 ASSERT_TRUE(extension); 24 ASSERT_TRUE(extension);
25 GURL url = extension->GetResourceURL("file.html"); 25 GURL url = extension->GetResourceURL("file.html");
26 browser()->OpenURL(content::OpenURLParams( 26 browser()->OpenURL(content::OpenURLParams(
27 url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB, 27 url, content::Referrer(), WindowOpenDisposition::NEW_FOREGROUND_TAB,
28 ui::PAGE_TRANSITION_TYPED, false)); 28 ui::PAGE_TRANSITION_TYPED, false));
29 // Without waiting for the tab to finish, unload the extension. 29 // Without waiting for the tab to finish, unload the extension.
30 extension_service()->UnloadExtension(extension->id(), 30 extension_service()->UnloadExtension(extension->id(),
31 UnloadedExtensionInfo::REASON_TERMINATE); 31 UnloadedExtensionReason::TERMINATE);
32 content::WebContents* web_contents = 32 content::WebContents* web_contents =
33 browser()->tab_strip_model()->GetActiveWebContents(); 33 browser()->tab_strip_model()->GetActiveWebContents();
34 // Wait for the web contents to stop loading. 34 // Wait for the web contents to stop loading.
35 content::WaitForLoadStop(web_contents); 35 content::WaitForLoadStop(web_contents);
36 EXPECT_EQ(url, web_contents->GetLastCommittedURL()); 36 EXPECT_EQ(url, web_contents->GetLastCommittedURL());
37 ASSERT_FALSE(web_contents->IsCrashed()); 37 ASSERT_FALSE(web_contents->IsCrashed());
38 } 38 }
39 39
40 // Tests that loading a file from a theme in a tab doesn't crash anything. 40 // Tests that loading a file from a theme in a tab doesn't crash anything.
41 // Another part of crbug.com/528026 and related. 41 // Another part of crbug.com/528026 and related.
42 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, 42 IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest,
43 TestRendererInitializationWithThemesTab) { 43 TestRendererInitializationWithThemesTab) {
44 const Extension* extension = LoadExtensionWithFlags( 44 const Extension* extension = LoadExtensionWithFlags(
45 test_data_dir_.AppendASCII("theme"), kFlagAllowOldManifestVersions); 45 test_data_dir_.AppendASCII("theme"), kFlagAllowOldManifestVersions);
46 ASSERT_TRUE(extension); 46 ASSERT_TRUE(extension);
47 ASSERT_TRUE(extension->is_theme()); 47 ASSERT_TRUE(extension->is_theme());
48 GURL url = extension->GetResourceURL("manifest.json"); 48 GURL url = extension->GetResourceURL("manifest.json");
49 ui_test_utils::NavigateToURL(browser(), url); 49 ui_test_utils::NavigateToURL(browser(), url);
50 content::WebContents* web_contents = 50 content::WebContents* web_contents =
51 browser()->tab_strip_model()->GetActiveWebContents(); 51 browser()->tab_strip_model()->GetActiveWebContents();
52 // Wait for the web contents to stop loading. 52 // Wait for the web contents to stop loading.
53 content::WaitForLoadStop(web_contents); 53 content::WaitForLoadStop(web_contents);
54 EXPECT_EQ(url, web_contents->GetLastCommittedURL()); 54 EXPECT_EQ(url, web_contents->GetLastCommittedURL());
55 ASSERT_FALSE(web_contents->IsCrashed()); 55 ASSERT_FALSE(web_contents->IsCrashed());
56 } 56 }
57 57
58 } // namespace extensions 58 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/plugin_manager.cc ('k') | chrome/browser/extensions/shared_user_script_master.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698