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

Side by Side Diff: ios/chrome/browser/web_data_service_factory.cc

Issue 2647113002: [Sync] Convert Autocomplete to use sync's report error function. (Closed)
Patch Set: Wrong dep... Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ios/chrome/browser/web_data_service_factory.h" 5 #include "ios/chrome/browser/web_data_service_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "base/memory/singleton.h" 11 #include "base/memory/singleton.h"
12 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" 12 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
13 #include "components/keyed_service/core/service_access_type.h" 13 #include "components/keyed_service/core/service_access_type.h"
14 #include "components/keyed_service/ios/browser_state_dependency_manager.h" 14 #include "components/keyed_service/ios/browser_state_dependency_manager.h"
15 #include "components/search_engines/keyword_web_data_service.h" 15 #include "components/search_engines/keyword_web_data_service.h"
16 #include "components/signin/core/browser/webdata/token_web_data.h" 16 #include "components/signin/core/browser/webdata/token_web_data.h"
17 #include "components/webdata_services/web_data_service_wrapper.h" 17 #include "components/webdata_services/web_data_service_wrapper.h"
18 #include "ios/chrome/browser/application_context.h" 18 #include "ios/chrome/browser/application_context.h"
19 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h" 19 #include "ios/chrome/browser/browser_state/browser_state_otr_helper.h"
20 #include "ios/chrome/browser/browser_state/chrome_browser_state.h" 20 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
21 #include "ios/chrome/browser/sync/glue/sync_start_util.h" 21 #include "ios/chrome/browser/sync/glue/sync_start_util.h"
22 #include "ios/chrome/common/channel_info.h"
22 #include "ios/web/public/web_thread.h" 23 #include "ios/web/public/web_thread.h"
23 24
24 namespace ios { 25 namespace ios {
25 namespace { 26 namespace {
26 27
27 void DoNothingOnErrorCallback(WebDataServiceWrapper::ErrorType error_type, 28 void DoNothingOnErrorCallback(WebDataServiceWrapper::ErrorType error_type,
28 sql::InitStatus status, 29 sql::InitStatus status,
29 const std::string& diagnostics) {} 30 const std::string& diagnostics) {}
30 31
31 } // namespace 32 } // namespace
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 } 96 }
96 97
97 std::unique_ptr<KeyedService> WebDataServiceFactory::BuildServiceInstanceFor( 98 std::unique_ptr<KeyedService> WebDataServiceFactory::BuildServiceInstanceFor(
98 web::BrowserState* context) const { 99 web::BrowserState* context) const {
99 const base::FilePath& browser_state_path = context->GetStatePath(); 100 const base::FilePath& browser_state_path = context->GetStatePath();
100 return base::MakeUnique<WebDataServiceWrapper>( 101 return base::MakeUnique<WebDataServiceWrapper>(
101 browser_state_path, GetApplicationContext()->GetApplicationLocale(), 102 browser_state_path, GetApplicationContext()->GetApplicationLocale(),
102 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI), 103 web::WebThread::GetTaskRunnerForThread(web::WebThread::UI),
103 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB), 104 web::WebThread::GetTaskRunnerForThread(web::WebThread::DB),
104 ios::sync_start_util::GetFlareForSyncableService(browser_state_path), 105 ios::sync_start_util::GetFlareForSyncableService(browser_state_path),
105 &DoNothingOnErrorCallback); 106 &DoNothingOnErrorCallback, GetChannel());
106 } 107 }
107 108
108 web::BrowserState* WebDataServiceFactory::GetBrowserStateToUse( 109 web::BrowserState* WebDataServiceFactory::GetBrowserStateToUse(
109 web::BrowserState* context) const { 110 web::BrowserState* context) const {
110 return GetBrowserStateRedirectedInIncognito(context); 111 return GetBrowserStateRedirectedInIncognito(context);
111 } 112 }
112 113
113 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const { 114 bool WebDataServiceFactory::ServiceIsNULLWhileTesting() const {
114 return true; 115 return true;
115 } 116 }
116 117
117 } // namespace ios 118 } // namespace ios
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698