diff options
| author | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 03:27:02 +0000 |
|---|---|---|
| committer | dbeam@chromium.org <dbeam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-24 03:27:02 +0000 |
| commit | 028b8ac199c3b9ef7532ae26386246ef53e61a71 (patch) | |
| tree | 34abe83dddee781ae513787c87061309a6b98491 /win8/metro_driver | |
| parent | 33826fbd796d286022b16e7de324211a1bfbbb53 (diff) | |
| download | chromium_src-028b8ac199c3b9ef7532ae26386246ef53e61a71.zip chromium_src-028b8ac199c3b9ef7532ae26386246ef53e61a71.tar.gz chromium_src-028b8ac199c3b9ef7532ae26386246ef53e61a71.tar.bz2 | |
Revert 201806 "Create MetroViewerProcessHost as a common base fo..."
Broke ash_unittests on Win8 Aura:
http://build.chromium.org/p/chromium.win/builders/Win8%20Aura/builds/6316
[ RUN ] AcceleratorControllerTest.Register
[912:1324:0523/094526:1371217:INFO:test_metro_viewer_process_host.cc(42)] ash::test::TestMetroViewerProcessHost::OnSetTargetSurface, target_surface = 131580
[912:1324:0523/094526:1371233:FATAL:ash_test_base.cc(149)] Check failed: !metro_viewer_host_->closed_unexpectedly().
Backtrace:
base::debug::StackTrace::StackTrace [0x100839F1+33]
logging::LogMessage::~LogMessage [0x100F6FCE+94]
ash::test::AshTestBase::TearDown [0x006DC397+471]
testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x007405FF+319]
testing::Test::Run [0x0072A525+229]
testing::TestInfo::Run [0x0072AF4D+221]
testing::TestCase::Run [0x0072B71F+239]
testing::internal::UnitTestImpl::RunAllTests [0x0073234D+701]
testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x00741227+327]
testing::UnitTest::Run [0x00730BB0+192]
base::TestSuite::Run [0x00756AE0+240]
main [0x0058AFA4+100]
__tmainCRTStartup [0x0075BA6F+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555)
mainCRTStartup [0x0075B89F+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371)
BaseThreadInitThunk [0x76D78543+14]
RtlInitializeExceptionChain [0x7775AC69+133]
RtlInitializeExceptionChain [0x7775AC3C+88]
(No symbol) [0x00000000]
[912:1324:0523/094526:1371233:FATAL:ash_test_base.cc(149)] Check failed: !metro_viewer_host_->closed_unexpectedly().
Backtrace:
base::debug::StackTrace::StackTrace [0x100839F1+33]
logging::LogMessage::~LogMessage [0x100F6FCE+94]
ash::test::AshTestBase::TearDown [0x006DC397+471]
testing::internal::HandleExceptionsInMethodIfSupported<testing::Test,void> [0x007405FF+319]
testing::Test::Run [0x0072A525+229]
testing::TestInfo::Run [0x0072AF4D+221]
testing::TestCase::Run [0x0072B71F+239]
testing::internal::UnitTestImpl::RunAllTests [0x0073234D+701]
testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x00741227+327]
testing::UnitTest::Run [0x00730BB0+192]
base::TestSuite::Run [0x00756AE0+240]
main [0x0058AFA4+100]
__tmainCRTStartup [0x0075BA6F+447] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:555)
mainCRTStartup [0x0075B89F+15] (f:\dd\vctools\crt_bld\self_x86\crt\src\crtexe.c:371)
BaseThreadInitThunk [0x76D78543+14]
RtlInitializeExceptionChain [0x7775AC69+133]
RtlInitializeExceptionChain [0x7775AC3C+88]
(No symbol) [0x00000000]
> Create MetroViewerProcessHost as a common base for TestMetroViewerProcessHost and ChromeMetroViewerProcessHost
>
> Bringing LaunchViewerAndWaitForConnection() to the common base so that ChromeMetroViewerProcessHost can also benefit from it (required for ash browser tests).
>
> BUG=179830
>
> Review URL: https://chromiumcodereview.appspot.com/14629025
TBR=gab@chromium.org
Review URL: https://codereview.chromium.org/15966003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201966 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver')
| -rw-r--r-- | win8/metro_driver/metro_driver.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win8/metro_driver/metro_driver.gyp b/win8/metro_driver/metro_driver.gyp index 623b000..f1f9892 100644 --- a/win8/metro_driver/metro_driver.gyp +++ b/win8/metro_driver/metro_driver.gyp @@ -58,7 +58,7 @@ '../../google_update/google_update.gyp:google_update', '../../ipc/ipc.gyp:ipc', '../../sandbox/sandbox.gyp:sandbox', - '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer_messages', + '../../ui/metro_viewer/metro_viewer.gyp:metro_viewer', '../win8.gyp:check_sdk_patch', 'metro_driver_version_resources', ], |