diff options
| author | dbeam <dbeam@chromium.org> | 2014-09-18 14:07:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 21:08:01 +0000 |
| commit | c5fd1796d7390e5ea2e840d53992a0a6fbc14e21 (patch) | |
| tree | dbde750d3e4e1d0eac098d52b3ede2bf3d6c3b63 /chrome/browser/browser_process_impl.cc | |
| parent | aeae967ce9fd0b084bf7ab55a8e40a1eaf80afd0 (diff) | |
| download | chromium_src-c5fd1796d7390e5ea2e840d53992a0a6fbc14e21.zip chromium_src-c5fd1796d7390e5ea2e840d53992a0a6fbc14e21.tar.gz chromium_src-c5fd1796d7390e5ea2e840d53992a0a6fbc14e21.tar.bz2 | |
Revert of Add GCMChannelStatusSyncer to schedule requests and enable/disable GCM (patchset #8 id:150001 of https://codereview.chromium.org/561943002/)
Reason for revert:
this CL might be breaking browser_tests and interactive_ui_tests on ChromeOS because it's starting a request on startup. here's an example:
[15345:15369:0918/132152:ERROR:leak_tracker.h(97)] Leaked 0x11cd70da7cc0 which was allocated by:
[15345:15369:0918/132152:ERROR:leak_tracker.h(98)] #0 0x7f44b584025e base::debug::StackTrace::StackTrace()
#1 0x000000dfc481 base::debug::LeakTracker<>::LeakTracker()
#2 0x000000df3e8d SystemURLRequestContextGetter::SystemURLRequestContextGetter()
#3 0x000000df57f1 IOThread::InitSystemRequestContext()
#4 0x000000df570b IOThread::system_url_request_context_getter()
#5 0x000001443d9e BrowserProcessImpl::system_request_context()
#6 0x000001028a8e SafeBrowsingService::Initialize()
#7 0x0000014462c9 BrowserProcessImpl::CreateSafeBrowsingService()
#8 0x000001446196 BrowserProcessImpl::safe_browsing_service()
#9 0x0000014b9a06 ChromeResourceDispatcherHostDelegate::ChromeResourceDispatcherHostDelegate()
#10 0x0000014466dc BrowserProcessImpl::ResourceDispatcherHostCreated()
#11 0x0000008a88e5 chrome::ChromeContentBrowserClient::ResourceDispatcherHostCreated()
#12 0x7f44be489a2f content::ResourceDispatcherHostImpl::ResourceDispatcherHostImpl()
#13 0x7f44be060f44 content::BrowserMainLoop::BrowserThreadsStarted()
#14 0x7f44be068302 base::internal::RunnableAdapter<>::Run()
#15 0x7f44be06826c base::internal::InvokeHelper<>::MakeItSo()
#16 0x7f44be06821a base::internal::Invoker<>::Run()
#17 0x7f44be54e46e base::Callback<>::Run()
#18 0x7f44be8d223b content::StartupTaskRunner::RunAllTasksNow()
#19 0x7f44be05ff97 content::BrowserMainLoop::CreateStartupTasks()
#20 0x7f44be06b824 content::BrowserMainRunnerImpl::Initialize()
#21 0x7f44be05c7df content::BrowserMain()
#22 0x7f44bdee5f6f content::RunNamedProcessTypeMain()
#23 0x7f44bdee9268 content::ContentMainRunnerImpl::Run()
#24 0x7f44bdee5505 content::ContentMain()
#25 0x0000041aa8cb content::BrowserTestBase::SetUp()
#26 0x00000173e117 InProcessBrowserTest::SetUp()
#27 0x000000671180 ExtensionBrowserTest::SetUp()
#28 0x0000006711b2 ExtensionBrowserTest::SetUp()
#29 0x0000017fb993 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#30 0x0000017e8bfe testing::internal::HandleExceptionsInMethodIfSupported<>()
#31 0x0000017dd1e3 testing::Test::Run()
#32 0x0000017dd92b testing::TestInfo::Run()
#33 0x0000017ddf1a testing::TestCase::Run()
#34 0x0000017e3413 testing::internal::UnitTestImpl::RunAllTests()
#35 0x0000017f47d3 testing::internal::HandleSehExceptionsInMethodIfSupported<>()
#36 0x0000017ea96e testing::internal::HandleExceptionsInMethodIfSupported<>()
#37 0x0000017e30b1 testing::UnitTest::Run()
#38 0x000004187e41 RUN_ALL_TESTS()
#39 0x000004186e67 base::TestSuite::Run()
#40 0x0000007fcd62 InteractiveUITestSuiteRunner::RunTestSuite()
#41 0x00000173c7b8 (anonymous namespace)::ChromeTestLauncherDelegate::RunTestSuite()
#42 0x0000041bc2fb content::LaunchTests()
#43 0x00000173c6e9 LaunchChromeTests()
#44 0x0000007fccbf main
#45 0x7f44ad8ed76d __libc_start_main
#46 0x000000601389 <unknown>
[15345:15369:0918/132152:FATAL:leak_tracker.h(102)] Check failed: 0u == count (0 vs. 1)
#0 0x7f44b584025e base::debug::StackTrace::StackTrace()
#1 0x7f44b58d7a62 logging::LogMessage::~LogMessage()
#2 0x000000dfdd01 base::debug::LeakTracker<>::CheckForLeaks()
#3 0x000000df8e13 IOThread::CleanUp()
#4 0x7f44be0810b6 content::BrowserThreadImpl::CleanUp()
#5 0x7f44be07e852 content::BrowserProcessSubThread::CleanUp()
#6 0x7f44b59d0601 base::Thread::ThreadMain()
#7 0x7f44b59bba3c base::(anonymous namespace)::ThreadFunc()
#8 0x7f44b1aa9e9a start_thread
#9 0x7f44ad9c03fd clone
Original issue's description:
> Add GCMChannelStatusSyncer to schedule requests and enable/disable GCM
>
> BUG=384041
> TEST=new tests added
>
> Committed: https://crrev.com/3c23f4a188e171998f3042ad62f4aa5717e66d63
> Cr-Commit-Position: refs/heads/master@{#295524}
TBR=zea@chromium.org,fgorski@chromium.org,thestig@chromium.org,bauerb@chromium.org,jianli@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=384041
Review URL: https://codereview.chromium.org/582913003
Cr-Commit-Position: refs/heads/master@{#295549}
Diffstat (limited to 'chrome/browser/browser_process_impl.cc')
| -rw-r--r-- | chrome/browser/browser_process_impl.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 36de9d9..03f9702 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -1135,7 +1135,6 @@ void BrowserProcessImpl::CreateGCMDriver() { CHECK(PathService::Get(chrome::DIR_GLOBAL_GCM_STORE, &store_path)); gcm_driver_ = gcm::CreateGCMDriverDesktop( make_scoped_ptr(new gcm::GCMClientFactory), - local_state(), store_path, system_request_context()); // Sign-in is not required for device-level GCM usage. So we just call |