Un-refcount AutofillWebData and TokenWebData

components/autofill/browser/autocomplete_history_manager_unittest.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 <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string16.h"
@@ skipping 20 matching lines @@
 using testing::_;
 
 namespace autofill {
 
 namespace {
 
 class MockWebDataService : public AutofillWebDataService {
  public:
   MockWebDataService()
       : AutofillWebDataService() {
-    current_mock_web_data_service_ = this;
   }
 
   MOCK_METHOD1(AddFormFields, void(const std::vector<FormFieldData>&));
 
-  static scoped_refptr<MockWebDataService> GetCurrent() {
-    if (!current_mock_web_data_service_) {
-      return new MockWebDataService();
-    }
-    return current_mock_web_data_service_;
-  }
-
- protected:
   virtual ~MockWebDataService() {}
-
- private:
-  // Keep track of the most recently created instance, so that it can be
-  // associated with the current profile when Build() is called.
-  static MockWebDataService* current_mock_web_data_service_;
-};
-
-MockWebDataService* MockWebDataService::current_mock_web_data_service_ = NULL;
-
-class MockWebDataServiceWrapperCurrent : public MockWebDataServiceWrapperBase {
- public:
-  static BrowserContextKeyedService* Build(content::BrowserContext* profile) {
-    return new MockWebDataServiceWrapperCurrent();
-  }
-
-  MockWebDataServiceWrapperCurrent() {}
-
-  virtual scoped_refptr<AutofillWebDataService> GetAutofillWebData() OVERRIDE {
-    return MockWebDataService::GetCurrent();
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(MockWebDataServiceWrapperCurrent);
 };
 
 class MockAutofillManagerDelegate
     : public autofill::TestAutofillManagerDelegate {
  public:
   MockAutofillManagerDelegate() {}
   virtual ~MockAutofillManagerDelegate() {}
   virtual PrefService* GetPrefs() OVERRIDE { return &prefs_; }
 
  private:
   TestingPrefServiceSimple prefs_;
 
   DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
 };
 
+BrowserContextKeyedService* BuildMockWebDataServiceWrapper(
+    content::BrowserContext* profile) {
+  return new MockWebDataServiceWrapper(
+      NULL,
+      new MockWebDataService(),
+      NULL);
+}
+
 }  // namespace
 
 class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
-    web_data_service_ = new MockWebDataService();
-    WebDataServiceFactory::GetInstance()->SetTestingFactory(
-        profile(), MockWebDataServiceWrapperCurrent::Build);
+    MockWebDataServiceWrapper* wrapper =
+        static_cast<MockWebDataServiceWrapper*>(
+            WebDataServiceFactory::GetInstance()->SetTestingFactoryAndUse(
+                profile(), BuildMockWebDataServiceWrapper));
+    web_data_service_ =
+        static_cast<MockWebDataService*>(wrapper->GetAutofillWebData());
     autocomplete_manager_.reset(new AutocompleteHistoryManager(web_contents()));
   }
 
   virtual void TearDown() OVERRIDE {
     autocomplete_manager_.reset();
+    web_data_service_->ShutdownOnUIThread();
     web_data_service_ = NULL;
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
-  scoped_refptr<MockWebDataService> web_data_service_;
+  MockWebDataService* web_data_service_;
   scoped_ptr<AutocompleteHistoryManager> autocomplete_manager_;
   MockAutofillManagerDelegate manager_delegate;
 };
 
 // Tests that credit card numbers are not sent to the WebDatabase to be saved.
 TEST_F(AutocompleteHistoryManagerTest, CreditCardNumberValue) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
   // Valid Visa credit card number pulled from the paypal help site.
   FormFieldData valid_cc;
   valid_cc.label = ASCIIToUTF16("Credit Card");
   valid_cc.name = ASCIIToUTF16("ccnum");
   valid_cc.value = ASCIIToUTF16("4012888888881881");
   valid_cc.form_control_type = "text";
   form.fields.push_back(valid_cc);
 
-  EXPECT_CALL(*web_data_service_.get(), AddFormFields(_)).Times(0);
+  EXPECT_CALL(*web_data_service_, AddFormFields(_)).Times(0);
   autocomplete_manager_->OnFormSubmitted(form);
 }
 
 // Contrary test to AutocompleteHistoryManagerTest.CreditCardNumberValue.  The
 // value being submitted is not a valid credit card number, so it will be sent
 // to the WebDatabase to be saved.
 TEST_F(AutocompleteHistoryManagerTest, NonCreditCardNumberValue) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
   // Invalid credit card number.
   FormFieldData invalid_cc;
   invalid_cc.label = ASCIIToUTF16("Credit Card");
   invalid_cc.name = ASCIIToUTF16("ccnum");
   invalid_cc.value = ASCIIToUTF16("4580123456789012");
   invalid_cc.form_control_type = "text";
   form.fields.push_back(invalid_cc);
 
-  EXPECT_CALL(*(web_data_service_.get()), AddFormFields(_)).Times(1);
+  EXPECT_CALL(*(web_data_service_), AddFormFields(_)).Times(1);
   autocomplete_manager_->OnFormSubmitted(form);
 }
 
 // Tests that SSNs are not sent to the WebDatabase to be saved.
 TEST_F(AutocompleteHistoryManagerTest, SSNValue) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
   FormFieldData ssn;
   ssn.label = ASCIIToUTF16("Social Security Number");
   ssn.name = ASCIIToUTF16("ssn");
   ssn.value = ASCIIToUTF16("078-05-1120");
   ssn.form_control_type = "text";
   form.fields.push_back(ssn);
 
-  EXPECT_CALL(*web_data_service_.get(), AddFormFields(_)).Times(0);
+  EXPECT_CALL(*web_data_service_, AddFormFields(_)).Times(0);
   autocomplete_manager_->OnFormSubmitted(form);
 }
 
 // Verify that autocomplete text is saved for search fields.
 TEST_F(AutocompleteHistoryManagerTest, SearchField) {
   FormData form;
   form.name = ASCIIToUTF16("MyForm");
   form.method = ASCIIToUTF16("POST");
   form.origin = GURL("http://myform.com/form.html");
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
   // Search field.
   FormFieldData search_field;
   search_field.label = ASCIIToUTF16("Search");
   search_field.name = ASCIIToUTF16("search");
   search_field.value = ASCIIToUTF16("my favorite query");
   search_field.form_control_type = "search";
   form.fields.push_back(search_field);
 
-  EXPECT_CALL(*(web_data_service_.get()), AddFormFields(_)).Times(1);
+  EXPECT_CALL(*(web_data_service_), AddFormFields(_)).Times(1);
   autocomplete_manager_->OnFormSubmitted(form);
 }
 
 namespace {
 
 class MockAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   explicit MockAutofillExternalDelegate(content::WebContents* web_contents)
       : AutofillExternalDelegate(
             web_contents, AutofillManager::FromWebContents(web_contents)) {}
@@ skipping 43 matching lines @@
 
   MockAutofillExternalDelegate external_delegate(web_contents());
   autocomplete_history_manager.SetExternalDelegate(&external_delegate);
 
   // Should trigger a call to OnSuggestionsReturned, verified by the mock.
   EXPECT_CALL(external_delegate, OnSuggestionsReturned(_, _, _, _, _));
   autocomplete_history_manager.SendSuggestions(NULL);
 }
 
 }  // namespace autofill