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

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

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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 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 <queue> 5 #include <queue>
6 #include <utility> 6 #include <utility>
7 7
8 #include "base/location.h" 8 #include "base/location.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
(...skipping 2033 matching lines...) Expand 10 before | Expand all | Expand 10 after
2044 #if defined(OS_WIN) 2044 #if defined(OS_WIN)
2045 #define MAYBE_TearDownTest DISABLED_TearDownTest 2045 #define MAYBE_TearDownTest DISABLED_TearDownTest
2046 #else 2046 #else
2047 #define MAYBE_TearDownTest TearDownTest 2047 #define MAYBE_TearDownTest TearDownTest
2048 #endif 2048 #endif
2049 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_TearDownTest) { 2049 IN_PROC_BROWSER_TEST_P(WebViewTest, MAYBE_TearDownTest) {
2050 const extensions::Extension* extension = 2050 const extensions::Extension* extension =
2051 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED"); 2051 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED");
2052 extensions::AppWindow* window = NULL; 2052 extensions::AppWindow* window = NULL;
2053 if (!GetAppWindowCount()) 2053 if (!GetAppWindowCount())
2054 window = CreateAppWindow(extension); 2054 window = CreateAppWindow(browser()->profile(), extension);
2055 else 2055 else
2056 window = GetFirstAppWindow(); 2056 window = GetFirstAppWindow();
2057 CloseAppWindow(window); 2057 CloseAppWindow(window);
2058 2058
2059 // Load the app again. 2059 // Load the app again.
2060 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED"); 2060 LoadAndLaunchPlatformApp("web_view/simple", "WebViewTest.LAUNCHED");
2061 } 2061 }
2062 2062
2063 // In following GeolocationAPIEmbedderHasNoAccess* tests, embedder (i.e. the 2063 // In following GeolocationAPIEmbedderHasNoAccess* tests, embedder (i.e. the
2064 // platform app) does not have geolocation permission for this test. 2064 // platform app) does not have geolocation permission for this test.
(...skipping 1050 matching lines...) Expand 10 before | Expand all | Expand 10 after
3115 // 4 tasks expected. The order is arbitrary. 3115 // 4 tasks expected. The order is arbitrary.
3116 // Tab: about:blank, 3116 // Tab: about:blank,
3117 // Background Page: <webview> task manager test, 3117 // Background Page: <webview> task manager test,
3118 // App: <webview> task manager test, 3118 // App: <webview> task manager test,
3119 // Webview: WebViewed test content. 3119 // Webview: WebViewed test content.
3120 EXPECT_EQ(4U, task_manager.tasks().size()); 3120 EXPECT_EQ(4U, task_manager.tasks().size());
3121 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents)); 3121 EXPECT_TRUE(HasExpectedGuestTask(task_manager, guest_contents));
3122 } 3122 }
3123 3123
3124 #endif // defined(ENABLE_TASK_MANAGER) 3124 #endif // defined(ENABLE_TASK_MANAGER)
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698