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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Issue 9834056: Moved WebDataService to ProfileKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: upload rebase Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 8aa53cac9bcb3eb69fde4264a387683c34a6b220..03eb440b143f89371bfa48989a8befc320d78c26 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -21,6 +21,7 @@
#include "chrome/browser/ui/intents/web_intent_picker_model_observer.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/browser/webdata/web_data_service_factory.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "chrome/test/base/in_process_browser_test.h"
@@ -213,8 +214,8 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
fake_url_fetcher_factory_.reset(
new FakeURLFetcherFactory(default_url_fetcher_factory_.get()));
- web_data_service_ =
- GetBrowser()->profile()->GetWebDataService(Profile::EXPLICIT_ACCESS);
+ web_data_service_ = WebDataServiceFactory::GetForProfile(
+ GetBrowser()->profile(), Profile::EXPLICIT_ACCESS);
favicon_service_ =
GetBrowser()->profile()->GetFaviconService(Profile::EXPLICIT_ACCESS);
controller_ = GetBrowser()->
@@ -291,7 +292,7 @@ class WebIntentPickerControllerBrowserTest : public InProcessBrowserTest {
}
WebIntentPickerMock picker_;
- WebDataService* web_data_service_;
+ scoped_refptr<WebDataService> web_data_service_;
FaviconService* favicon_service_;
WebIntentPickerController* controller_;
scoped_ptr<DummyURLFetcherFactory> default_url_fetcher_factory_;
« no previous file with comments | « chrome/browser/sync/test/integration/autofill_helper.cc ('k') | chrome/browser/ui/intents/web_intents_model_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698