sync: some fixups for --sync-enabled-deferred-init

chrome/browser/webdata/web_data_service_factory.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/webdata/web_data_service_factory.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
@@ skipping 41 matching lines @@
       autofill_web_data)->InjectStartSyncFlare(flare);
   AutofillProfileSyncableService::CreateForWebDataService(
       autofill_web_data, app_locale);
 }
 
 }  // namespace
 
 WebDataServiceWrapper::WebDataServiceWrapper() {}
 
 WebDataServiceWrapper::WebDataServiceWrapper(Profile* profile) {
-  base::FilePath path = profile->GetPath();
-  path = path.Append(kWebDataFilename);
+  base::FilePath profile_path = profile->GetPath();
+  base::FilePath path = profile_path.Append(kWebDataFilename);
 
   web_database_ = new WebDatabaseService(path);
 
   // All tables objects that participate in managing the database must
   // be added here.
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new autofill::AutofillTable(
           g_browser_process->GetApplicationLocale())));
   web_database_->AddTable(
       scoped_ptr<WebDatabaseTable>(new KeywordTable()));
@@ skipping 18 matching lines @@
   autofill_web_data_->Init();
 
   web_data_ = new WebDataService(
       web_database_, base::Bind(&ProfileErrorCallback));
   web_data_->Init();
 
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&InitSyncableServicesOnDBThread,
                  autofill_web_data_,
-                 sync_start_util::GetFlareForSyncableService(path),
+                 sync_start_util::GetFlareForSyncableService(profile_path),
                  g_browser_process->GetApplicationLocale()));
 }
 
 WebDataServiceWrapper::~WebDataServiceWrapper() {
 }
 
 void WebDataServiceWrapper::Shutdown() {
   autofill_web_data_->ShutdownOnUIThread();
   web_data_->ShutdownOnUIThread();
   web_database_->ShutdownDatabase();
@@ skipping 79 matching lines @@
 }
 
 ProfileKeyedService* WebDataServiceFactory::BuildServiceInstanceFor(
     content::BrowserContext* profile) const {
   return new WebDataServiceWrapper(static_cast<Profile*>(profile));
 }
 
 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
   return true;
 }