ash/test/ash_test_base.h - Issue 14629025: Create MetroViewerProcessHost as a common base for TestMetroViewerProcessHost and ChromeMetroViewer…

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

Unified Diff: ash/test/ash_test_base.h

Issue 14629025: Create MetroViewerProcessHost as a common base for TestMetroViewerProcessHost and ChromeMetroViewer… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge before dcommit Created 7 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: ash/test/ash_test_base.h

diff --git a/ash/test/ash_test_base.h b/ash/test/ash_test_base.h

index dd65bf47bd3852e83283f38b7c6b6e994bf1d168..2d9f71707e19fbf226bc539d7014c9f355ef8520 100644

--- a/ash/test/ash_test_base.h

+++ b/ash/test/ash_test_base.h

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

#include "base/compiler_specific.h"

#include "base/message_loop.h"

+#include "base/threading/thread.h"

#include "testing/gtest/include/gtest/gtest.h"

#include "third_party/skia/include/core/SkColor.h"

#include "ui/aura/client/window_types.h"

@@ -109,6 +110,9 @@ class AshTestBase : public testing::Test {

scoped_ptr<AshTestHelper> ash_test_helper_;

scoped_ptr<aura::test::EventGenerator> event_generator_;

#if defined(OS_WIN)

+ // Note that the order is important here as ipc_thread_ should be destroyed

+ // after metro_viewer_host_->channel_.

+ scoped_ptr<base::Thread> ipc_thread_;

scoped_ptr<TestMetroViewerProcessHost> metro_viewer_host_;

ui::ScopedOleInitializer ole_initializer_;

#endif

« no previous file with comments | « ash/test/DEPS ('k') | ash/test/ash_test_base.cc » ('j') | no next file with comments »