extensions/shell/test/shell_test.cc - Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi...

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: extensions/shell/test/shell_test.cc

Issue 2835233002: Fix integration tests in src/chrome and src/extensions so that we can turn on IO thread checks wi... (Closed)

Patch Set: ready for review 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

« no previous file with comments | « extensions/shell/test/shell_apitest.cc ('k') | net/test/cert_test_util.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 "extensions/shell/test/shell_test.h"	5 #include "extensions/shell/test/shell_test.h"

6	6

7 #include "base/base_paths.h"	7 #include "base/base_paths.h"

8 #include "base/command_line.h"	8 #include "base/command_line.h"

9 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

10 #include "base/logging.h"	10 #include "base/logging.h"

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 }	48 }

49	49

50 void AppShellTest::PreRunTestOnMainThread() {	50 void AppShellTest::PreRunTestOnMainThread() {

51 browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();	51 browser_context_ = ShellContentBrowserClient::Get()->GetBrowserContext();

52	52

53 extension_system_ = static_cast<ShellExtensionSystem*>(	53 extension_system_ = static_cast<ShellExtensionSystem*>(

54 ExtensionSystem::Get(browser_context_));	54 ExtensionSystem::Get(browser_context_));

55 extension_system_->Init();	55 extension_system_->Init();

56 DCHECK(base::MessageLoopForUI::IsCurrent());	56 DCHECK(base::MessageLoopForUI::IsCurrent());

57 base::RunLoop().RunUntilIdle();	57 base::RunLoop().RunUntilIdle();

58

59 // TODO(jam): remove this.

60 disable_io_checks();

61 }	58 }

62	59

63 void AppShellTest::PostRunTestOnMainThread() {	60 void AppShellTest::PostRunTestOnMainThread() {

64 // Clean up the app window.	61 // Clean up the app window.

65 DesktopController::instance()->CloseAppWindows();	62 DesktopController::instance()->CloseAppWindows();

66 }	63 }

67	64

68 } // namespace extensions	65 } // namespace extensions

OLD	NEW