Include v2 packaged apps in sync.

chrome/browser/sync/test/integration/sync_test.cc

Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index d64411c689308fa95a2dbd9c64de853a9658cb65..911d580d43cfb25dc4d910e53331a789f8875634 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -360,6 +360,9 @@ bool SyncTest::SetupSync() {
 }
 
 void SyncTest::CleanUpOnMainThread() {
+  // Some of the pending messages might rely on browser windows still being
+  // around, so run messages both before and after closing all browsers.

[akalin, 2012/11/19 19:28:59]

whoa, what did you run into that needed this?

[Marijn Kruisselbrink, 2012/11/19 19:39:59]

Without that line, I got the following stack trace, which as far as I can tell
is caused by the loading of the background pages of platform apps after their
browser processes have quit.

[6687:6687:1119/102634:1206708479018:FATAL:browser_process_impl.cc(511)] Check
failed: print_job_manager_.get(). 
        base::debug::StackTrace::StackTrace() [0x7f48f1b5b764]
        logging::LogMessage::~LogMessage() [0x7f48f1b8d5f9]
        BrowserProcessImpl::print_job_manager() [0x1017080]
        PrintingMessageFilter::PrintingMessageFilter() [0xdfac91]
        chrome::ChromeContentBrowserClient::RenderProcessHostCreated()
[0xcc4b22]
        content::RenderProcessHostImpl::Init() [0x7f48ea7caa89]
        content::RenderViewHostImpl::CreateRenderView() [0x7f48ea7de57c]
        content::WebContentsImpl::CreateRenderViewForRenderManager()
[0x7f48ea89d913]
        content::RenderViewHostManager::InitRenderView() [0x7f48ea88b110]
        content::RenderViewHostManager::CreateRenderView() [0x7f48ea88afeb]
        content::RenderViewHostManager::UpdateRendererStateForNavigate()
[0x7f48ea88bbe3]
        content::RenderViewHostManager::Navigate() [0x7f48ea88947e]
        content::WebContentsImpl::NavigateToEntry() [0x7f48ea896e9b]
        content::WebContentsImpl::NavigateToPendingEntry() [0x7f48ea896d80]
        content::NavigationControllerImpl::NavigateToPendingEntry()
[0x7f48ea88414e]
        content::NavigationControllerImpl::LoadEntry() [0x7f48ea87f6b2]
        content::NavigationControllerImpl::LoadURLWithParams() [0x7f48ea880997]
        content::NavigationControllerImpl::LoadURL() [0x7f48ea880434]
        extensions::ExtensionHost::LoadInitialURL() [0x1134012]
        extensions::ExtensionHost::CreateRenderViewNow() [0x1133d52]
        extensions::ExtensionHost::ProcessCreationQueue::ProcessOneHost()
[0x11362b7]
        base::internal::RunnableAdapter<>::Run() [0x1137610]
        base::internal::InvokeHelper<>::MakeItSo() [0x11374fc]
        base::internal::Invoker<>::Run() [0x11373c9]
        base::Callback<>::Run() [0x7f48f1b537a1]
        MessageLoop::RunTask() [0x7f48f1b924a9]
        MessageLoop::DeferOrRunPendingTask() [0x7f48f1b925c4]
        MessageLoop::DoWork() [0x7f48f1b92e31]
        base::MessagePumpGlib::HandleDispatch() [0x7f48f1b396fd]
        (anonymous namespace)::WorkSourceDispatch() [0x7f48f1b39023]
        <unknown> [0x7f48e69b2d53]
        <unknown> [0x7f48e69b30a0]
        <unknown> [0x7f48e69b3164]
        base::MessagePumpGlib::RunWithDispatcher() [0x7f48f1b393ac]
        base::MessagePumpGlib::Run() [0x7f48f1b397da]
        MessageLoop::RunInternal() [0x7f48f1b920ad]
        MessageLoop::RunHandler() [0x7f48f1b91f64]
        base::RunLoop::Run() [0x7f48f1bc6b54]
        content::RunThisRunLoop() [0x1096283]
        content::RunMessageLoop() [0x1096218]
        content::RunAllPendingInMessageLoop() [0x1096316]
        SyncTest::CleanUpOnMainThread() [0x757cec]
        InProcessBrowserTest::RunTestOnMainThreadLoop() [0x13a3e8a]
        content::BrowserTestBase::ProxyRunTestOnMainThreadLoop() [0x20f34c1]
        base::internal::RunnableAdapter<>::Run() [0x20f39f8]
        base::internal::InvokeHelper<>::MakeItSo() [0x20f398f]
        base::internal::Invoker<>::Run() [0x20f3947]
        base::Callback<>::Run() [0x70043b]
        ChromeBrowserMainParts::PreMainMessageLoopRunImpl() [0xfdc78e]
        ChromeBrowserMainParts::PreMainMessageLoopRun() [0xfdaf68]
        content::BrowserMainLoop::CreateThreads() [0x7f48ea59128c]
        content::BrowserMainRunnerImpl::Initialize() [0x7f48ea593d0a]
        content::BrowserMain() [0x7f48ea58f84f]
        content::BrowserTestBase::SetUp() [0x20f344c]
        InProcessBrowserTest::SetUp() [0x13a3193]
        SyncTest::SetUp() [0x7563ef]
        testing::internal::HandleSehExceptionsInMethodIfSupported<>()
[0x1603fb4]
        testing::internal::HandleExceptionsInMethodIfSupported<>() [0x1600e85]
        testing::Test::Run() [0x15f681f]
        testing::TestInfo::Run() [0x15f6e4e]
        testing::TestCase::Run() [0x15f7340]
        testing::internal::UnitTestImpl::RunAllTests() [0x15fb94e]

+  content::RunAllPendingInMessageLoop();
   // Close all browser windows.
   browser::CloseAllBrowsers();
   content::RunAllPendingInMessageLoop();