Always Close the Autofill UI through the same path

chrome/browser/autofill/autofill_external_delegate_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 "base/memory/scoped_ptr.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/autofill/test_autofill_manager_delegate.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 10 matching lines @@
 #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"
 
 namespace {
 
 class MockAutofillManagerDelegate
     : public autofill::TestAutofillManagerDelegate {
  public:
+  MockAutofillManagerDelegate() {}
+  virtual ~MockAutofillManagerDelegate() {}
+
   virtual PrefService* GetPrefs() { return &prefs_; }
 
   PrefRegistrySyncable* GetPrefRegistry() {
     return prefs_.registry();
   }
 
   MOCK_METHOD6(ShowAutofillPopup,
                void(const gfx::RectF& element_bounds,
                     const std::vector<string16>& values,
                     const std::vector<string16>& labels,
                     const std::vector<string16>& icons,
                     const std::vector<int>& identifiers,
                     AutofillPopupDelegate* delegate));
 
   MOCK_METHOD0(HideAutofillPopup, void());
 
  private:
   TestingPrefServiceSyncable prefs_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockAutofillManagerDelegate);
 };
 
 // Subclass AutofillManager so we can create AutofillManager instance.
 class TestAutofillManager : public AutofillManager {
  public:
   TestAutofillManager(content::WebContents* web_contents,
                       autofill::AutofillManagerDelegate* delegate)
       : AutofillManager(web_contents, delegate) {}
   virtual ~TestAutofillManager() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAutofillManager);
 };
 
+// Subclass AutofillExternalDelegate so we can create an
+// AutofillExternalDelegate instance.
 class TestAutofillExternalDelegate : public AutofillExternalDelegate {
  public:
   TestAutofillExternalDelegate(content::WebContents* web_contents,
                                AutofillManager* autofill_manager)
       : AutofillExternalDelegate(web_contents, autofill_manager) {}
   ~TestAutofillExternalDelegate() {}
 };
 
 }  // namespace
 
@@ skipping 66 matching lines @@
       content::Source<content::NavigationController>(
           &(web_contents_->GetController())));
   browser()->OpenURL(content::OpenURLParams(
       GURL(chrome::kChromeUIBookmarksURL), content::Referrer(),
       CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
   browser()->OpenURL(content::OpenURLParams(
       GURL(chrome::kChromeUIAboutURL), content::Referrer(),
       CURRENT_TAB, content::PAGE_TRANSITION_TYPED, false));
   observer.Wait();
 }