Clean up WebNavigationObserver by taking out password specific callbacks, and...

chrome/browser/autofill/form_structure_browsertest.cc

 // Copyright (c) 2010 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/file_path.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 218 matching lines @@
     ASSERT_NO_FATAL_FAILURE(ui_test_utils::NavigateToURL(
         browser(), GURL(input_file_source)));
 
     ASSERT_NO_FATAL_FAILURE(ui_test_utils::ClickOnView(browser(),
                                                        VIEW_ID_TAB_CONTAINER));
     ASSERT_TRUE(ui_test_utils::IsViewFocused(
         browser(),
         VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
 
     AutoFillManager* autofill_manager =
-        browser()->GetSelectedTabContents()->autofill_manager();
+        browser()->GetSelectedTabContents()->autofill_manager_;
     ASSERT_NE(static_cast<AutoFillManager*>(NULL), autofill_manager);
     std::vector<FormStructure*> forms = GetFormStructures(*autofill_manager);
 
     FilePath output_file_directory = GetOutputFileDirectory();
     FilePath output_file_path = output_file_directory.Append(
         input_file_path.BaseName().StripTrailingSeparators().ReplaceExtension(
             FILE_PATH_LITERAL(".out")));
 
     std::string output_file_source;
     if (file_util::ReadFileToString(output_file_path, &output_file_source)) {
       ASSERT_EQ(NormalizeText(output_file_source),
                 NormalizeText(
                     FormStructureBrowserTest::FormStructuresToString(forms)));
 
     } else {
       ASSERT_TRUE(WriteFile(
           output_file_path,
           FormStructureBrowserTest::FormStructuresToString(forms)));
     }
   }
 }