From 2d99a984b6323cf6cc5c9a4c359d3c3f61f59612 Mon Sep 17 00:00:00 2001 From: "yusukes@google.com" Date: Fri, 11 May 2012 07:36:36 +0000 Subject: Revert 136499 - Taking over issue 10006037. Moved WebDataService to ProfileKeyedService James: chrome\browser\ui\intents Peter: chrome\browser\ui\search_engines chrome\browser\search_engines Nicolas: chrome\browser\sync Rachel/Elliot: chrome\browser\profiles and the whole cl BUG=112234 TEST=unit-tests TBR=jhawkins@chromium.org,pkasting@chromium.org,zea@chromium.org,erg@chromium.org,isherman@chromium.org Review URL: https://chromiumcodereview.appspot.com/10185008 Reason of the revert: The CL broke the following linux_chromeos browser_tests. EnterpriseLoginBlocksForEnterpriseUser_0 EnterpriseLoginBlocksForEnterpriseUser_1 EnterpriseLoginBlocksForEnterpriseUser_2 EnterpriseLoginBlocksForEnterpriseUser_3 EnterpriseLoginBlocksForEnterpriseUser_4 EnterpriseLoginBlocksForEnterpriseUser_5 EnterpriseLoginDoesntBlockForNormalUser NormalLoginDoesntBlock sample log: http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%28dbg%29%282%29/builds/1071/steps/browser_tests/logs/stdio [14648:14648:0510/212507:358430278:FATAL:web_data_service.cc(96)] Check failed: BrowserThread::IsWellKnownThread(BrowserThread::DB). Backtrace: base::debug::StackTrace::StackTrace() [0x7ff2e9b74e76] logging::LogMessage::~LogMessage() [0x7ff2e9ba6627] WebDataService::WebDataService() [0x144d7a7] TBR=rlp@chromium.org Review URL: https://chromiumcodereview.appspot.com/10382123 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136522 0039d316-1c4b-4281-b951-d872f2087c98 --- .../chrome_geolocation_permission_context_unittest.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'chrome/browser/geolocation') diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index 07a6257..9bbbee4 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/hash_tables.h" #include "base/memory/scoped_vector.h" -#include "base/synchronization/waitable_event.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/content_settings/tab_specific_content_settings.h" #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h" @@ -141,7 +140,6 @@ class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness { virtual void TearDown() OVERRIDE; content::TestBrowserThread ui_thread_; - content::TestBrowserThread db_thread_; // A map between renderer child id and a pair represending the bridge id and // whether the requested permission was allowed. @@ -150,8 +148,7 @@ class GeolocationPermissionContextTests : public TabContentsWrapperTestHarness { GeolocationPermissionContextTests::GeolocationPermissionContextTests() : TabContentsWrapperTestHarness(), - ui_thread_(BrowserThread::UI, MessageLoop::current()), - db_thread_(BrowserThread::DB) { + ui_thread_(BrowserThread::UI, MessageLoop::current()) { } GeolocationPermissionContextTests::~GeolocationPermissionContextTests() { @@ -231,7 +228,6 @@ void GeolocationPermissionContextTests::CheckTabContentsState( } void GeolocationPermissionContextTests::SetUp() { - db_thread_.Start(); TabContentsWrapperTestHarness::SetUp(); geolocation_permission_context_ = new ChromeGeolocationPermissionContext(profile()); @@ -240,13 +236,6 @@ void GeolocationPermissionContextTests::SetUp() { void GeolocationPermissionContextTests::TearDown() { extra_tabs_.reset(); TabContentsWrapperTestHarness::TearDown(); - // Schedule another task on the DB thread to notify us that it's safe to - // carry on with the test. - base::WaitableEvent done(false, false); - BrowserThread::PostTask(BrowserThread::DB, FROM_HERE, - base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done))); - done.Wait(); - db_thread_.Stop(); } -- cgit v1.1