Move all code in c/b/autofill and autofill related code in c/b/ui into namespace autofill

BUG=140037,165534

Review URL: https://chromiumcodereview.appspot.com/13247002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193540 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 6 deletions

diff --git a/components/autofill/browser/autofill_manager.h b/components/autofill/browser/autofill_manager.h
index a7cc564..ae16413 100644
--- a/components/autofill/browser/autofill_manager.h
+++ b/components/autofill/browser/autofill_manager.h
@@ -52,6 +52,7 @@ struct ViewHostMsg_FrameNavigate_Params;
 namespace autofill {
 class AutofillManagerDelegate;
 class AutofillManagerTestDelegate;
+class FormStructureBrowserTest;
 class PasswordGenerator;
 }
 
@@ -434,7 +435,7 @@ class AutofillManager : public content::WebContentsObserver,
   base::WeakPtrFactory<AutofillManager> weak_ptr_factory_;
 
   friend class AutofillManagerTest;
-  friend class FormStructureBrowserTest;
+  friend class autofill::FormStructureBrowserTest;
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
                            DeterminePossibleFieldTypesForUpload);
   FRIEND_TEST_ALL_PREFIXES(AutofillManagerTest,
diff --git a/components/autofill/browser/autofill_manager_unittest.cc b/components/autofill/browser/autofill_manager_unittest.cc
index 475465d..5747e25 100644
--- a/components/autofill/browser/autofill_manager_unittest.cc
+++ b/components/autofill/browser/autofill_manager_unittest.cc
@@ -680,7 +680,7 @@ class AutofillManagerTest : public ChromeRenderViewHostTestHarness {
     TestingProfile* profile = CreateProfile();
     profile->CreateRequestContext();
     browser_context_.reset(profile);
-    PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
+    autofill::PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
         profile, TestPersonalDataManager::Build);
 
     ChromeRenderViewHostTestHarness::SetUp();
diff --git a/components/autofill/browser/autofill_metrics_unittest.cc b/components/autofill/browser/autofill_metrics_unittest.cc
index ab9d803..a03d5b7 100644
--- a/components/autofill/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/browser/autofill_metrics_unittest.cc
@@ -306,7 +306,8 @@ void AutofillMetricsTest::SetUp() {
   TestingProfile* profile = new TestingProfile();
   profile->CreateRequestContext();
   browser_context_.reset(profile);
-  PersonalDataManagerFactory::GetInstance()->SetTestingFactory(profile, NULL);
+  autofill::PersonalDataManagerFactory::GetInstance()->SetTestingFactory(
+      profile, NULL);
 
   ChromeRenderViewHostTestHarness::SetUp();
   io_thread_.StartIOThread();
@@ -341,7 +342,7 @@ scoped_ptr<ConfirmInfoBarDelegate> AutofillMetricsTest::CreateDelegate(
               LogCreditCardInfoBarMetric(AutofillMetrics::INFOBAR_SHOWN));
 
   CreditCard credit_card;
-  return AutofillCCInfoBarDelegate::CreateForTesting(
+  return autofill::AutofillCCInfoBarDelegate::CreateForTesting(
       metric_logger,
       base::Bind(&TestPersonalDataManager::SaveImportedCreditCard,
                  base::Unretained(personal_data_.get()), credit_card));
diff --git a/components/autofill/browser/personal_data_manager.h b/components/autofill/browser/personal_data_manager.h
index b614233c..311a52a 100644
--- a/components/autofill/browser/personal_data_manager.h
+++ b/components/autofill/browser/personal_data_manager.h
@@ -23,6 +23,11 @@ class AutofillMetrics;
 class FormStructure;
 class PersonalDataManagerObserver;
 
+namespace autofill {
+class AutofillTest;
+class PersonalDataManagerFactory;
+}
+
 namespace autofill_helper {
 void SetProfiles(int, std::vector<AutofillProfile>*);
 void SetCreditCards(int, std::vector<CreditCard>*);
@@ -174,8 +179,8 @@ class PersonalDataManager : public WebDataServiceConsumer,
   FRIEND_TEST_ALL_PREFIXES(AutofillMetricsTest, AutofillIsEnabledAtStartup);
   FRIEND_TEST_ALL_PREFIXES(PersonalDataManagerTest,
                            AggregateExistingAuxiliaryProfile);
-  friend class AutofillTest;
-  friend class PersonalDataManagerFactory;
+  friend class autofill::AutofillTest;
+  friend class autofill::PersonalDataManagerFactory;
   friend class PersonalDataManagerTest;
   friend class ProfileSyncServiceAutofillTest;
   friend class RemoveAutofillTester;