diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 07:36:36 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-11 07:36:36 +0000 |
| commit | 2d99a984b6323cf6cc5c9a4c359d3c3f61f59612 (patch) | |
| tree | 9f6007622beded72c5d742196efeaae651aa1fbc /chrome/browser/importer | |
| parent | 294dd0316b3246c30e4558e8ec380479c9e82481 (diff) | |
| download | chromium_src-2d99a984b6323cf6cc5c9a4c359d3c3f61f59612.zip chromium_src-2d99a984b6323cf6cc5c9a4c359d3c3f61f59612.tar.gz chromium_src-2d99a984b6323cf6cc5c9a4c359d3c3f61f59612.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/profile_writer.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/importer/profile_writer.cc b/chrome/browser/importer/profile_writer.cc index eb3b659..8519432 100644 --- a/chrome/browser/importer/profile_writer.cc +++ b/chrome/browser/importer/profile_writer.cc @@ -20,7 +20,6 @@ #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_service.h" #include "chrome/browser/search_engines/template_url_service_factory.h" -#include "chrome/browser/webdata/web_data_service_factory.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/pref_names.h" @@ -95,8 +94,7 @@ void ProfileWriter::AddPasswordForm(const webkit::forms::PasswordForm& form) { #if defined(OS_WIN) void ProfileWriter::AddIE7PasswordInfo(const IE7PasswordInfo& info) { - WebDataServiceFactory::GetForProfile( - profile_, Profile::EXPLICIT_ACCESS)->AddIE7Login(info); + profile_->GetWebDataService(Profile::EXPLICIT_ACCESS)->AddIE7Login(info); } #endif |