chrome/browser/ui/ash/keyboard_controller_browsertest.cc - Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner.

Unified Diff: chrome/browser/ui/ash/keyboard_controller_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: Fix ALL THE TESTS. Hopefully. Created 4 years, 10 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

« no previous file with comments | « chrome/browser/ui/ash/accelerator_commands_browsertest.cc ('k') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc » ('j') | chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/ash/keyboard_controller_browsertest.cc

diff --git a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc

index f5b05bab769a0babbe28a72f0f147761a121bc71..e43c4a882ef911789db1ef277b506c61dabb87f9 100644

--- a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc

+++ b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc

@@ -6,6 +6,7 @@

#include "base/command_line.h"

#include "base/macros.h"

#include "chrome/browser/apps/app_browsertest_util.h"

+#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/test/base/in_process_browser_test.h"

#include "content/public/browser/render_widget_host_view.h"

@@ -158,16 +159,23 @@ IN_PROC_BROWSER_TEST_F(VirtualKeyboardAppWindowTest,

DisableOverscrollForImeWindow) {

scoped_refptr<extensions::Extension> extension =

extensions::ExtensionBuilder()

- .SetManifest(std::move(extensions::DictionaryBuilder()

- .Set("name", "test extension")

- .Set("version", "1")

- .Set("manifest_version", 2)))

+ .SetManifest(std::move(

+ extensions::DictionaryBuilder()

+ .Set("name", "test extension")

+ .Set("version", "1")

+ .Set("manifest_version", 2)

+ .Set(

+ "background",

+ std::move(extensions::DictionaryBuilder().Set(

+ "scripts", std::move(extensions::ListBuilder().Append(

+ "background.js")))))))

dcheng 2016/02/26 22:52:29 Needed to fake out an extension background page: t

.Build();

+ extension_service()->AddExtension(extension.get());

extensions::AppWindow::CreateParams non_ime_params;

non_ime_params.frame = extensions::AppWindow::FRAME_NONE;

- extensions::AppWindow* non_ime_app_window =

- CreateAppWindowFromParams(extension.get(), non_ime_params);

+ extensions::AppWindow* non_ime_app_window = CreateAppWindowFromParams(

+ browser()->profile(), extension.get(), non_ime_params);

int non_ime_window_visible_height = non_ime_app_window->web_contents()

->GetRenderWidgetHostView()

->GetVisibleViewportSize()

@@ -176,8 +184,8 @@ IN_PROC_BROWSER_TEST_F(VirtualKeyboardAppWindowTest,

extensions::AppWindow::CreateParams ime_params;

ime_params.frame = extensions::AppWindow::FRAME_NONE;

ime_params.is_ime_window = true;

- extensions::AppWindow* ime_app_window =

- CreateAppWindowFromParams(extension.get(), ime_params);

+ extensions::AppWindow* ime_app_window = CreateAppWindowFromParams(

+ browser()->profile(), extension.get(), ime_params);

int ime_window_visible_height = ime_app_window->web_contents()

->GetRenderWidgetHostView()

->GetVisibleViewportSize()