Better error reasons for rAc

components/autofill/content/browser/request_autocomplete_manager_unittest.cc

 // Copyright 2013 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 "components/autofill/content/browser/content_autofill_driver.h"
 #include "components/autofill/content/browser/request_autocomplete_manager.h"
 #include "components/autofill/content/common/autofill_messages.h"
 #include "components/autofill/core/browser/test_autofill_manager_delegate.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_renderer_host.h"
@@ skipping 30 matching lines @@
 
 class CustomTestAutofillManagerDelegate : public TestAutofillManagerDelegate {
   public:
     CustomTestAutofillManagerDelegate() : should_simulate_success_(true) {}
 
     virtual ~CustomTestAutofillManagerDelegate() {}
 
     virtual void ShowRequestAutocompleteDialog(
         const FormData& form,
         const GURL& source_url,
-        const base::Callback<void(const FormStructure*)>& callback) OVERRIDE {
+        const ResultCallback& callback) OVERRIDE {
       if (should_simulate_success_) {
         FormStructure form_structure(form);
-        callback.Run(&form_structure);
+        callback.Run(AutocompleteResultSuccess, &form_structure);
       } else {
-        callback.Run(NULL);
+        callback.Run(AutofillManagerDelegate::AutocompleteResultErrorDisabled,
+                     NULL);
       }
     }
 
     void set_should_simulate_success(bool should_simulate_success) {
       should_simulate_success_ = should_simulate_success;
     }
 
   private:
     // Enable testing the path where a callback is called without a
     // valid FormStructure.
@@ skipping 68 matching lines @@
   scoped_ptr<TestContentAutofillDriver> driver_;
   scoped_ptr<RequestAutocompleteManager> request_autocomplete_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RequestAutocompleteManagerTest);
 };
 
 TEST_F(RequestAutocompleteManagerTest, OnRequestAutocompleteSuccess) {
   blink::WebFormElement::AutocompleteResult result;
   request_autocomplete_manager_->OnRequestAutocomplete(FormData(), GURL());
   EXPECT_TRUE(GetAutocompleteResultMessage(&result));
-  EXPECT_EQ(result, blink::WebFormElement::AutocompleteResultSuccess);
+  EXPECT_EQ(blink::WebFormElement::AutocompleteResultSuccess, result);
 }
 
 TEST_F(RequestAutocompleteManagerTest, OnRequestAutocompleteCancel) {
   blink::WebFormElement::AutocompleteResult result;
   manager_delegate_.set_should_simulate_success(false);
   request_autocomplete_manager_->OnRequestAutocomplete(FormData(), GURL());
   EXPECT_TRUE(GetAutocompleteResultMessage(&result));
-  EXPECT_EQ(result, blink::WebFormElement::AutocompleteResultErrorCancel);
+  EXPECT_EQ(blink::WebFormElement::AutocompleteResultErrorDisabled, result);
 }
 
+// Disabling autofill doesn't disable the dialog (it just disables the use of
+// autofill in the dialog).
 TEST_F(RequestAutocompleteManagerTest,
        OnRequestAutocompleteWithAutofillDisabled) {
   blink::WebFormElement::AutocompleteResult result;
   driver_->mock_autofill_manager()->set_autofill_enabled(false);
   request_autocomplete_manager_->OnRequestAutocomplete(FormData(), GURL());
   EXPECT_TRUE(GetAutocompleteResultMessage(&result));
-  EXPECT_EQ(result, blink::WebFormElement::AutocompleteResultSuccess);
+  EXPECT_EQ(blink::WebFormElement::AutocompleteResultSuccess, result);
 }
 
 }  // namespace autofill