Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(75)

Issue 2396443002: Revert of Integrate registry_hash_store_contents with the rest of tracked prefs. (Closed)

Created:
4 years, 2 months ago by Guido Urdaneta
Modified:
4 years, 2 months ago
Reviewers:
proberge, gab
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Integrate registry_hash_store_contents with the rest of tracked prefs. (patchset #24 id:460001 of https://codereview.chromium.org/2204943002/ ) Reason for revert: This CL is suspect of breaking WebRTC Windows bots. I will reland if it doesn't fix the problem. See, for example, https://build.chromium.org/p/chromium.webrtc/builders/Win7%20Tester/builds/30007/steps/browser_tests/logs/stdio [4936:6236:0930/181348:INFO:webrtc_video_quality_browsertest.cc(245)] Running "C:\b\depot_tools\python276_bin\python.exe" -u "C:\b\c\b\Win7_Tester\src\third_party/webrtc/tools/compare_videos.py" --label=720p_VP9 --ref_video "C:\b\c\b\Win7_Tester\src\chrome\test\data\webrtc/resources\reference_video_1280x720_30fps.yuv" --test_video "C:\Users\CHROME~1.LAB\AppData\Local\Temp\scoped_dir4936_9527\captured_video.yuv" --frame_analyzer "C:\b\c\b\Win7_Tester\src\out\Release\frame_analyzer.exe" --yuv_frame_width 1280 --yuv_frame_height 720 --zxing_path "C:\b\c\b\Win7_Tester\src\chrome\test\data\webrtc/resources\tools\win\zxing.exe" --ffmpeg_path "C:\b\c\b\Win7_Tester\src\chrome\test\data\webrtc/resources\tools\win\ffmpeg.exe" --stats_file "C:\Users\CHROME~1.LAB\AppData\Local\Temp\scoped_dir4936_9527\stats.txt" [4936:6236:0930/181420:INFO:user_input_monitor_win.cc(171)] RegisterRawInputDevices() failed for RIDEV_REMOVE: The parameter is incorrect. (0x57) [4936:6236:0930/181421:FATAL:json_pref_store.cc(385)] Check failed: !has_pending_write_callbacks_. Backtrace: base::debug::StackTrace::StackTrace [0x02BA3CF7+23] logging::LogMessage::~LogMessage [0x02B5B061+49] JsonPrefStore::RegisterOnNextWriteSynchronousCallbacks [0x03668FDF+154] JsonPrefStore::SerializeData [0x03669601+179] base::ImportantFileWriter::DoScheduledWrite [0x02BE4B15+149] JsonPrefStore::CommitPendingWrite [0x0366803E+120] JsonPrefStore::~JsonPrefStore [0x03667DF8+21] scoped_refptr<TestingPrefStore>::Release [0x056591C1+23] SegregatedPrefStore::~SegregatedPrefStore [0x04359463+95] scoped_refptr<TestingPrefStore>::Release [0x056591C1+23] PrefService::~PrefService [0x03663ED9+141] syncable_prefs::PrefServiceSyncable::~PrefServiceSyncable [0x04088703+93] syncable_prefs::PrefServiceSyncable::`scalar deleting destructor' [0x04088714+11] ProfileImpl::~ProfileImpl [0x02C5706B+271] ProfileDestroyer::DestroyProfileWhenAppropriate [0x02D1A381+484] ProfileManager::ProfileInfo::~ProfileInfo [0x02C04D62+14] std::_Tree<std::_Tmap_traits<base::FilePath,linked_ptr<ProfileManager::ProfileInfo>,std::less<base::FilePath>,std::allocator<std::pair<base::FilePath const ,linked_ptr<ProfileManager::ProfileInfo> > >,0> >::_Erase [0x02B54889+41] std::_Tree<std::_Tmap_traits<base::FilePath,linked_ptr<ProfileManager::ProfileInfo>,std::less<base::FilePath>,std::allocator<std::pair<base::FilePath const ,linked_ptr<ProfileManager::ProfileInfo> > >,0> >::clear [0x02B548B2+13] std::_Tree<std::_Tmap_traits<base::FilePath,linked_ptr<ProfileManager::ProfileInfo>,std::less<base::FilePath>,std::allocator<std::pair<base::FilePath const ,linked_ptr<ProfileManager::ProfileInfo> > >,0> >::~_Tree<std::_Tmap_traits<base::FilePath,linked_p [0x02C04D0E+21] ProfileManager::~ProfileManager [0x02C04DAF+54] BrowserProcessImpl::StartTearDown [0x02DD70E9+458] ChromeBrowserMainParts::PostMainMessageLoopRun [0x02E333B0+304] content::BrowserMainLoop::ShutdownThreadsAndCleanUp [0x024E327A+350] content::BrowserMainRunnerImpl::Shutdown [0x024E4498+632] content::BrowserMain [0x024DFE41+139] content::RunNamedProcessTypeMain [0x02B46FAB+206] content::ContentMainRunnerImpl::Run [0x02B46EAC+274] content::ContentMain [0x02B46275+35] content::BrowserTestBase::SetUp [0x02F73565+964] InProcessBrowserTest::SetUp [0x02BF45D7+268] testing::internal::HandleExceptionsInMethodIfSupported<testing::TestCase,void> [0x033F7AB9+32] testing::Test::Run [0x033FEAA3+51] testing::TestCase::Run [0x033FEB79+133] testing::internal::UnitTestImpl::RunAllTests [0x033FEEF8+433] testing::internal::HandleExceptionsInMethodIfSupported<testing::internal::UnitTestImpl,bool> [0x033F7AFD+32] testing::UnitTest::Run [0x033FED22+133] base::TestSuite::Run [0x02BFD110+95] ChromeTestSuiteRunner::RunTestSuite [0x052456CE+40] content::LaunchTests [0x02F6D485+585] LaunchChromeTests [0x052456A1+49] main [0x052454BA+63] __scrt_common_main_seh [0x0520AD1F+249] (f:\dd\vctools\crt\vcstartup\src\startup\exe_common.inl:253) BaseThreadInitThunk [0x75A0338A+18] RtlInitializeExceptionChain [0x77899902+99] RtlInitializeExceptionChain [0x778998D5+54] Original issue's description: > Integrate registry_hash_store_contents with the rest of tracked prefs. > > This change adds Windows-only logic to the PrefHashFilter such that it > verifies preferences against MACs stored in the registry. Unlike the > current tracked preference logic, this extra check does NOT reset > settings. > > To avoid inconsistent state with the MACs in secure_preferences, we > clear the registry MACs before writing secure_preferences, and write > the registry MACs after the file is successfully written. > > BUG=624858 > > Committed: https://crrev.com/4683dfcecfa72a73e00498d7c06fcf6716f8366c > Cr-Commit-Position: refs/heads/master@{#422240} TBR=gab@chromium.org,proberge@chromium.org # Not skipping CQ checks because original CL landed more than 1 days ago. BUG=624858 Committed: https://crrev.com/6f3cd9084b8ff605be5fbeb13f24ff36f998c40b Cr-Commit-Position: refs/heads/master@{#422738}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+51 lines, -912 lines) Patch
M chrome/browser/prefs/profile_pref_store_manager.h View 3 chunks +0 lines, -15 lines 0 comments Download
M chrome/browser/prefs/profile_pref_store_manager.cc View 7 chunks +10 lines, -53 lines 0 comments Download
M chrome/browser/prefs/tracked/pref_hash_browsertest.cc View 14 chunks +1 line, -214 lines 0 comments Download
M components/user_prefs/tracked/dictionary_hash_store_contents.h View 1 chunk +0 lines, -2 lines 0 comments Download
M components/user_prefs/tracked/dictionary_hash_store_contents.cc View 2 chunks +1 line, -11 lines 0 comments Download
M components/user_prefs/tracked/hash_store_contents.h View 1 chunk +0 lines, -9 lines 0 comments Download
M components/user_prefs/tracked/pref_hash_filter.h View 5 chunks +0 lines, -34 lines 0 comments Download
M components/user_prefs/tracked/pref_hash_filter.cc View 7 chunks +12 lines, -145 lines 0 comments Download
M components/user_prefs/tracked/pref_hash_filter_unittest.cc View 5 chunks +2 lines, -314 lines 0 comments Download
M components/user_prefs/tracked/pref_hash_store.h View 1 chunk +0 lines, -1 line 0 comments Download
M components/user_prefs/tracked/registry_hash_store_contents_win.h View 2 chunks +2 lines, -6 lines 0 comments Download
M components/user_prefs/tracked/registry_hash_store_contents_win.cc View 5 chunks +6 lines, -18 lines 0 comments Download
M components/user_prefs/tracked/registry_hash_store_contents_win_unittest.cc View 2 chunks +4 lines, -6 lines 0 comments Download
M components/user_prefs/tracked/tracked_atomic_preference.h View 1 chunk +2 lines, -5 lines 0 comments Download
M components/user_prefs/tracked/tracked_atomic_preference.cc View 3 chunks +4 lines, -31 lines 0 comments Download
M components/user_prefs/tracked/tracked_preference.h View 2 chunks +2 lines, -10 lines 0 comments Download
M components/user_prefs/tracked/tracked_split_preference.h View 1 chunk +2 lines, -5 lines 0 comments Download
M components/user_prefs/tracked/tracked_split_preference.cc View 4 chunks +3 lines, -33 lines 0 comments Download

Messages

Total messages: 7 (3 generated)
Guido Urdaneta
Created Revert of Integrate registry_hash_store_contents with the rest of tracked prefs.
4 years, 2 months ago (2016-10-04 08:51:32 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2396443002/1
4 years, 2 months ago (2016-10-04 08:51:47 UTC) #3
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 2 months ago (2016-10-04 09:51:12 UTC) #5
commit-bot: I haz the power
4 years, 2 months ago (2016-10-04 09:53:23 UTC) #7
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/6f3cd9084b8ff605be5fbeb13f24ff36f998c40b
Cr-Commit-Position: refs/heads/master@{#422738}

Powered by Google App Engine
This is Rietveld 408576698