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

Unified Diff: chrome/browser/extensions/extension_browsertest.cc

Issue 10412047: Fix flakiness by removing GetLastActive from extension browser tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Initial patch Created 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index 5297e1d9b12c390c0dc0ac1d0ba74f7a013959be..a56ef53a2612da2bd23eddaf0d15643412e6c8f1 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -12,6 +12,7 @@
#include "base/path_service.h"
#include "base/scoped_temp_dir.h"
#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
#include "chrome/browser/extensions/app_shortcut_manager.h"
#include "chrome/browser/extensions/component_loader.h"
#include "chrome/browser/extensions/crx_installer.h"
@@ -28,6 +29,8 @@
#include "chrome/common/chrome_paths.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_view_host.h"
@@ -460,6 +463,53 @@ bool ExtensionBrowserTest::WaitForExtensionCrash(
return (service->GetExtensionById(extension_id, true) == NULL);
}
+void ExtensionBrowserTest::OpenWindow(content::WebContents* contents,
+ const GURL& url,
+ bool newtab_process_should_equal_opener,
+ content::WebContents** newtab_result) {
+ ui_test_utils::WindowedNotificationObserver observer(
+ content::NOTIFICATION_LOAD_STOP,
+ content::NotificationService::AllSources());
+ ASSERT_TRUE(ui_test_utils::ExecuteJavaScript(
+ contents->GetRenderViewHost(), L"",
+ L"window.open('" + UTF8ToWide(url.spec()) + L"');"));
+
+ // The above window.open call is not user-initiated, so it will create
+ // a popup window instead of a new tab in current window.
+ // The stop notification will come from the new tab.
+ observer.Wait();
+ content::NavigationController* controller =
+ content::Source<content::NavigationController>(observer.source()).ptr();
+ content::WebContents* newtab = controller->GetWebContents();
+ ASSERT_TRUE(newtab);
+ EXPECT_EQ(url, controller->GetLastCommittedEntry()->GetURL());
+ if (newtab_process_should_equal_opener)
Matt Perry 2012/05/23 00:56:40 It seems weird to have this special check here. Ca
Charlie Reis 2012/05/23 01:01:20 I suppose I could duplicate it into all the call s
Matt Perry 2012/05/23 01:02:19 OK, nevermind. Since all callers care, let's just
+ EXPECT_EQ(contents->GetRenderProcessHost(), newtab->GetRenderProcessHost());
+ else
+ EXPECT_NE(contents->GetRenderProcessHost(), newtab->GetRenderProcessHost());
+
+ if (newtab_result)
+ *newtab_result = newtab;
+}
+
+void ExtensionBrowserTest::NavigateInRenderer(content::WebContents* contents,
+ const GURL& url) {
+ bool result = false;
+ ui_test_utils::WindowedNotificationObserver observer(
+ content::NOTIFICATION_LOAD_STOP,
+ content::NotificationService::AllSources());
+ ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
+ contents->GetRenderViewHost(), L"",
+ L"window.addEventListener('unload', function() {"
+ L" window.domAutomationController.send(true);"
+ L"}, false);"
+ L"window.location = '" + UTF8ToWide(url.spec()) + L"';",
+ &result));
+ ASSERT_TRUE(result);
+ observer.Wait();
+ EXPECT_EQ(url, contents->GetController().GetLastCommittedEntry()->GetURL());
+}
+
void ExtensionBrowserTest::Observe(
int type,
const content::NotificationSource& source,
« no previous file with comments | « chrome/browser/extensions/extension_browsertest.h ('k') | chrome/browser/extensions/extension_browsertests_misc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698