importer: Cleanup ProfileInfo calls a little bit.

- Rename the struct from ProfileInfo to SourceProfile, so it makes a bit more
  sense.
- Rename the ImporterList methods, removing the Info from the ProfileInfo, so it's just
  SourceProfile.
- Forward declare SourceProfile struct whenever is possible.
- Use uint16 for the bitmask of importer::ImportItem where is applicable.

BUG=None
TEST=None

R=avi@chromium.org

Review URL: http://codereview.chromium.org/6801004

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

1 files changed, 9 insertions, 8 deletions

diff --git a/chrome/browser/importer/importer_host.h b/chrome/browser/importer/importer_host.h
index 1c80455..bb3ad0b 100644
--- a/chrome/browser/importer/importer_host.h
+++ b/chrome/browser/importer/importer_host.h
@@ -65,16 +65,17 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
 
   // Starts the process of importing the settings and data depending on what the
   // user selected.
-  // |profile_info| - browser profile to import.
+  // |source_profile| - importer profile to import.
   // |target_profile| - profile to import into.
   // |items| - specifies which data to import (bitmask of importer::ImportItem).
   // |writer| - called to actually write data back to the profile.
   // |first_run| - true if this method is being called during first run.
-  virtual void StartImportSettings(const importer::ProfileInfo& profile_info,
-                                   Profile* target_profile,
-                                   uint16 items,
-                                   ProfileWriter* writer,
-                                   bool first_run);
+  virtual void StartImportSettings(
+      const importer::SourceProfile& source_profile,
+      Profile* target_profile,
+      uint16 items,
+      ProfileWriter* writer,
+      bool first_run);
 
   // Cancels the import process.
   virtual void Cancel();
@@ -88,10 +89,10 @@ class ImporterHost : public base::RefCountedThreadSafe<ImporterHost>,
   // Make sure that Firefox isn't running, if import browser is Firefox. Show
   // to the user a dialog that notifies that is necessary to close Firefox
   // prior to continue.
-  // |profile_info| - browser profile to import.
+  // |source_profile| - importer profile to import.
   // |items| - specifies which data to import (bitmask of importer::ImportItem).
   // |first_run| - true if this method is being called during first run.
-  void CheckForFirefoxLock(const importer::ProfileInfo& profile_info,
+  void CheckForFirefoxLock(const importer::SourceProfile& source_profile,
                            uint16 items,
                            bool first_run);