Start deinlining non-empty virtual methods. (This will be automatically checked

for in the future.)

BUG=none
TEST=compiles

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

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

10 files changed, 25 insertions, 5 deletions

diff --git a/net/ftp/ftp_directory_listing_parser_ls.cc b/net/ftp/ftp_directory_listing_parser_ls.cc
index 40546c8..9660eab 100644
--- a/net/ftp/ftp_directory_listing_parser_ls.cc
+++ b/net/ftp/ftp_directory_listing_parser_ls.cc
@@ -91,6 +91,10 @@ FtpDirectoryListingParserLs::FtpDirectoryListingParserLs(
 
 FtpDirectoryListingParserLs::~FtpDirectoryListingParserLs() {}
 
+FtpServerType FtpDirectoryListingParserLs::GetServerType() const {
+  return SERVER_LS;
+}
+
 bool FtpDirectoryListingParserLs::ConsumeLine(const string16& line) {
   if (line.empty() && !received_nonempty_line_) {
     // Allow empty lines only at the beginning of the listing. For example VMS
diff --git a/net/ftp/ftp_directory_listing_parser_ls.h b/net/ftp/ftp_directory_listing_parser_ls.h
index 6cb3655..3004f70 100644
--- a/net/ftp/ftp_directory_listing_parser_ls.h
+++ b/net/ftp/ftp_directory_listing_parser_ls.h
@@ -23,7 +23,7 @@ class FtpDirectoryListingParserLs : public FtpDirectoryListingParser {
   virtual ~FtpDirectoryListingParserLs();
 
   // FtpDirectoryListingParser methods:
-  virtual FtpServerType GetServerType() const { return SERVER_LS; }
+  virtual FtpServerType GetServerType() const;
   virtual bool ConsumeLine(const string16& line);
   virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
diff --git a/net/ftp/ftp_directory_listing_parser_mlsd.cc b/net/ftp/ftp_directory_listing_parser_mlsd.cc
index d8ae618..f2558415 100644
--- a/net/ftp/ftp_directory_listing_parser_mlsd.cc
+++ b/net/ftp/ftp_directory_listing_parser_mlsd.cc
@@ -60,6 +60,10 @@ FtpDirectoryListingParserMlsd::FtpDirectoryListingParserMlsd() {}
 
 FtpDirectoryListingParserMlsd::~FtpDirectoryListingParserMlsd() {}
 
+FtpServerType FtpDirectoryListingParserMlsd::GetServerType() const {
+  return SERVER_MLSD;
+}
+
 bool FtpDirectoryListingParserMlsd::ConsumeLine(const string16& line) {
   // The first space indicates where the filename begins.
   string16::size_type first_space_pos = line.find(' ');
diff --git a/net/ftp/ftp_directory_listing_parser_mlsd.h b/net/ftp/ftp_directory_listing_parser_mlsd.h
index c3e3acf..5c11fa0 100644
--- a/net/ftp/ftp_directory_listing_parser_mlsd.h
+++ b/net/ftp/ftp_directory_listing_parser_mlsd.h
@@ -20,7 +20,7 @@ class FtpDirectoryListingParserMlsd : public FtpDirectoryListingParser {
   virtual ~FtpDirectoryListingParserMlsd();
 
   // FtpDirectoryListingParser methods:
-  virtual FtpServerType GetServerType() const { return SERVER_MLSD; }
+  virtual FtpServerType GetServerType() const;
   virtual bool ConsumeLine(const string16& line);
   virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
diff --git a/net/ftp/ftp_directory_listing_parser_netware.cc b/net/ftp/ftp_directory_listing_parser_netware.cc
index ab7fb6d..1801a4a 100644
--- a/net/ftp/ftp_directory_listing_parser_netware.cc
+++ b/net/ftp/ftp_directory_listing_parser_netware.cc
@@ -42,6 +42,10 @@ FtpDirectoryListingParserNetware::FtpDirectoryListingParserNetware(
 
 FtpDirectoryListingParserNetware::~FtpDirectoryListingParserNetware() {}
 
+FtpServerType FtpDirectoryListingParserNetware::GetServerType() const {
+  return SERVER_NETWARE;
+}
+
 bool FtpDirectoryListingParserNetware::ConsumeLine(const string16& line) {
   if (!received_first_line_) {
     received_first_line_ = true;
diff --git a/net/ftp/ftp_directory_listing_parser_netware.h b/net/ftp/ftp_directory_listing_parser_netware.h
index 5fdcd84..48aebfc 100644
--- a/net/ftp/ftp_directory_listing_parser_netware.h
+++ b/net/ftp/ftp_directory_listing_parser_netware.h
@@ -23,7 +23,7 @@ class FtpDirectoryListingParserNetware : public FtpDirectoryListingParser {
   virtual ~FtpDirectoryListingParserNetware();
 
   // FtpDirectoryListingParser methods:
-  virtual FtpServerType GetServerType() const { return SERVER_NETWARE; }
+  virtual FtpServerType GetServerType() const;
   virtual bool ConsumeLine(const string16& line);
   virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
diff --git a/net/ftp/ftp_directory_listing_parser_vms.cc b/net/ftp/ftp_directory_listing_parser_vms.cc
index ed12665..c74dad0 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.cc
+++ b/net/ftp/ftp_directory_listing_parser_vms.cc
@@ -170,6 +170,10 @@ FtpDirectoryListingParserVms::FtpDirectoryListingParserVms()
 
 FtpDirectoryListingParserVms::~FtpDirectoryListingParserVms() {}
 
+FtpServerType FtpDirectoryListingParserVms::GetServerType() const {
+  return SERVER_VMS;
+}
+
 bool FtpDirectoryListingParserVms::ConsumeLine(const string16& line) {
   switch (state_) {
     case STATE_INITIAL:
diff --git a/net/ftp/ftp_directory_listing_parser_vms.h b/net/ftp/ftp_directory_listing_parser_vms.h
index 12f8dc7..118365d 100644
--- a/net/ftp/ftp_directory_listing_parser_vms.h
+++ b/net/ftp/ftp_directory_listing_parser_vms.h
@@ -19,7 +19,7 @@ class FtpDirectoryListingParserVms : public FtpDirectoryListingParser {
   virtual ~FtpDirectoryListingParserVms();
 
   // FtpDirectoryListingParser methods:
-  virtual FtpServerType GetServerType() const { return SERVER_VMS; }
+  virtual FtpServerType GetServerType() const;
   virtual bool ConsumeLine(const string16& line);
   virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;
diff --git a/net/ftp/ftp_directory_listing_parser_windows.cc b/net/ftp/ftp_directory_listing_parser_windows.cc
index e3211739..7bce556 100644
--- a/net/ftp/ftp_directory_listing_parser_windows.cc
+++ b/net/ftp/ftp_directory_listing_parser_windows.cc
@@ -76,6 +76,10 @@ FtpDirectoryListingParserWindows::FtpDirectoryListingParserWindows() {}
 
 FtpDirectoryListingParserWindows::~FtpDirectoryListingParserWindows() {}
 
+FtpServerType FtpDirectoryListingParserWindows::GetServerType() const {
+  return SERVER_WINDOWS;
+}
+
 bool FtpDirectoryListingParserWindows::ConsumeLine(const string16& line) {
   std::vector<string16> columns;
   base::SplitString(CollapseWhitespace(line, false), ' ', &columns);
diff --git a/net/ftp/ftp_directory_listing_parser_windows.h b/net/ftp/ftp_directory_listing_parser_windows.h
index 91ffe36..1f029af 100644
--- a/net/ftp/ftp_directory_listing_parser_windows.h
+++ b/net/ftp/ftp_directory_listing_parser_windows.h
@@ -18,7 +18,7 @@ class FtpDirectoryListingParserWindows : public FtpDirectoryListingParser {
   virtual ~FtpDirectoryListingParserWindows();
 
   // FtpDirectoryListingParser methods:
-  virtual FtpServerType GetServerType() const { return SERVER_WINDOWS; }
+  virtual FtpServerType GetServerType() const;
   virtual bool ConsumeLine(const string16& line);
   virtual bool OnEndOfInput();
   virtual bool EntryAvailable() const;