Abstract WebContentsObserver from Autofill shared code

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"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/webdata/web_data_service_factory.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/browser/autocomplete_history_manager.h"
 #include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
+#include "components/autofill/browser/test_autofill_driver.h"
 #include "components/autofill/browser/test_autofill_manager_delegate.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/common/form_data.h"
 #include "components/webdata/common/web_data_service_test_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 62 matching lines @@
 
 }  // namespace
 
 class AutocompleteHistoryManagerTest : public ChromeRenderViewHostTestHarness {
  protected:
   virtual void SetUp() OVERRIDE {
     ChromeRenderViewHostTestHarness::SetUp();
     web_data_service_ = new MockWebDataService();
     WebDataServiceFactory::GetInstance()->SetTestingFactory(
         profile(), MockWebDataServiceWrapperCurrent::Build);
-    autocomplete_manager_.reset(new AutocompleteHistoryManager(web_contents()));
+    autofill_driver_.reset(new TestAutofillDriver(web_contents()));
+    autocomplete_manager_.reset(
+        new AutocompleteHistoryManager(autofill_driver_.get()));
   }
 
   virtual void TearDown() OVERRIDE {
     autocomplete_manager_.reset();
     web_data_service_ = NULL;
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   scoped_refptr<MockWebDataService> web_data_service_;
   scoped_ptr<AutocompleteHistoryManager> autocomplete_manager_;
+  scoped_ptr<AutofillDriver> autofill_driver_;
   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");
@@ skipping 72 matching lines @@
   form.fields.push_back(search_field);
 
   EXPECT_CALL(*(web_data_service_.get()), 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)) {}
+  explicit MockAutofillExternalDelegate(content::WebContents* web_contents,
+                                        AutofillManager* autofill_manager)
+      : AutofillExternalDelegate(web_contents, autofill_manager) {}
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnSuggestionsReturned,
                void(int query_id,
                     const std::vector<base::string16>& autofill_values,
                     const std::vector<base::string16>& autofill_labels,
                     const std::vector<base::string16>& autofill_icons,
                     const std::vector<int>& autofill_unique_ids));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);
 };
 
-class AutocompleteHistoryManagerStubSend : public AutocompleteHistoryManager {
- public:
-  explicit AutocompleteHistoryManagerStubSend(WebContents* web_contents)
-      : AutocompleteHistoryManager(web_contents) {}
+class AutocompleteHistoryManagerNoIPC : public AutocompleteHistoryManager {
+  public:
+   explicit AutocompleteHistoryManagerNoIPC(AutofillDriver* driver)
+       : AutocompleteHistoryManager(driver) {
+     // Ensure that IPC is not sent during the test.
+     send_ipc_ = false;
+   }
 
   // Increase visibility for testing.
   void SendSuggestions(const std::vector<base::string16>* suggestions) {
     AutocompleteHistoryManager::SendSuggestions(suggestions);
   }

[Ilya Sherman, 2013/06/14 02:44:37]

nit: You can write this as "using AutocompleteHistoryManager::SendSuggestions;"

[blundell, 2013/06/14 09:54:08]

This doesn't work as SendSuggestions() is a member function in
AutocompleteHistoryManager.

On 2013/06/14 02:44:37, Ilya Sherman wrote:

[Ilya Sherman, 2013/06/14 23:22:23]

I'm pretty sure this should work.  See
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/ui/...
for an example.

On 2013/06/14 09:54:08, blundell wrote:

[blundell, 2013/06/15 12:52:32]

Thanks for the pointer - nifty! I had misunderstood your suggestion. Done.

On 2013/06/14 23:22:23, Ilya Sherman wrote:

-
-  // Intentionally swallow the message.
-  virtual bool Send(IPC::Message* message) OVERRIDE {
-    delete message;
-    return true;
-  }
 };
 
 }  // namespace
 
 // Make sure our external delegate is called at the right time.
 TEST_F(AutocompleteHistoryManagerTest, ExternalDelegate) {
-  // Local version with a stubbed out Send()
-  AutocompleteHistoryManagerStubSend autocomplete_history_manager(
-      web_contents());
+  AutocompleteHistoryManagerNoIPC autocomplete_history_manager(
+      autofill_driver_.get());
 
-  AutofillManager::CreateForWebContentsAndDelegate(
-      web_contents(),
+  scoped_ptr<AutofillManager> autofill_manager(new AutofillManager(
+      autofill_driver_.get(),
       &manager_delegate,
       "en-US",
-      AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER);
+      AutofillManager::ENABLE_AUTOFILL_DOWNLOAD_MANAGER));
 
-  MockAutofillExternalDelegate external_delegate(web_contents());
+  MockAutofillExternalDelegate external_delegate(web_contents(),
+                                                 autofill_manager.get());
   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