Cleanup: Include browser.h -> ui/browser.h [Part 4].

chrome/browser/autofill/autofill_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 <string>
 
 #include "app/keyboard_code_conversion.h"
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_common_test.h"
 #include "chrome/browser/autofill/autofill_profile.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/browser.h"
-#include "chrome/browser/browser_window.h"
 #include "chrome/browser/net/predictor_api.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class AutoFillTest : public InProcessBrowserTest {
  protected:
   AutoFillTest() {
     set_show_window(true);
     EnableDOMAutomation();
@@ skipping 116 matching lines @@
   ExpectFieldValue(L"firstname", "Milton");
   ExpectFieldValue(L"lastname", "Waddams");
   ExpectFieldValue(L"address1", "4120 Freidrich Lane");
   ExpectFieldValue(L"address2", "Basement");
   ExpectFieldValue(L"city", "Austin");
   ExpectFieldValue(L"state", "TX");
   ExpectFieldValue(L"zip", "78744");
   ExpectFieldValue(L"country", "US");
   ExpectFieldValue(L"phone", "5125551234");
 }