Moved WebDataService to ProfileKeyedService

chrome/browser/ui/intents/web_intent_picker_controller_browsertest.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 <algorithm>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/intents/web_intents_registry.h"
 #include "chrome/browser/intents/web_intents_registry_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/intents/web_intent_picker.h"
 #include "chrome/browser/ui/intents/web_intent_picker_controller.h"
 #include "chrome/browser/ui/intents/web_intent_picker_model.h"
 #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"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_intents_dispatcher.h"
 #include "content/test/test_url_fetcher_factory.h"
 #include "net/base/escape.h"
 #include "net/base/mock_host_resolver.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 175 matching lines @@
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     // The FakeURLFetcherFactory will return a NULL URLFetcher if a request is
     // created for a URL it doesn't know and there is no default factory.
     // Instead, use this dummy factory to infinitely delay the request.
     default_url_fetcher_factory_.reset(new DummyURLFetcherFactory);
     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()->
         GetSelectedTabContentsWrapper()->web_intent_picker_controller();
 
     controller_->set_picker(&picker_);
     controller_->set_model_observer(&picker_);
 
     CreateFakeIcon();
   }
@@ skipping 56 matching lines @@
     gfx::Image image(gfx::test::CreateImage());
     std::vector<unsigned char> image_data;
     bool result = gfx::PNGEncodedDataFromImage(image, &image_data);
     DCHECK(result);
 
     std::copy(image_data.begin(), image_data.end(),
               std::back_inserter(icon_response_));
   }
 
   WebIntentPickerMock picker_;
-  WebDataService* web_data_service_;
+  scoped_refptr<WebDataService> web_data_service_;
   FaviconService* favicon_service_;
   WebIntentPickerController* controller_;
   scoped_ptr<DummyURLFetcherFactory> default_url_fetcher_factory_;
   scoped_ptr<FakeURLFetcherFactory> fake_url_fetcher_factory_;
   std::string icon_response_;
 };
 
 IN_PROC_BROWSER_TEST_F(WebIntentPickerControllerBrowserTest, ChooseService) {
   AddWebIntentService(kAction1, kServiceURL1);
   AddWebIntentService(kAction1, kServiceURL2);
@@ skipping 126 matching lines @@
   picker_.Wait();
   EXPECT_EQ(1, picker_.num_extensions_installed_);
   const Extension* extension = browser()->profile()->GetExtensionService()->
       GetExtensionById(extension_id, false);
   EXPECT_TRUE(extension);
 
   // Installing an extension should also choose it. Since this extension uses
   // window disposition, it will create a new tab.
   ASSERT_EQ(2, browser()->tab_count());
 }