Rever r31175 r31176 r31187

XP tests are failing, the guess is r31175 and r31176.

TBR=beng
TEST=XP tests go green

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

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

12 files changed, 3 insertions, 29 deletions

diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/dom_ui/chrome_url_data_manager.h
index f553a3f..c159190 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.h
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.h
@@ -44,6 +44,7 @@ class ChromeURLDataManager {
     DataSource(const std::string& source_name,
                MessageLoop* message_loop)
         : source_name_(source_name), message_loop_(message_loop) {}
+    virtual ~DataSource() {}
 
     // Sent by the DataManager to request data at |path|.  The source should
     // call SendResponse() when the data is available or if the request could
@@ -75,11 +76,6 @@ class ChromeURLDataManager {
 
     static void SetFontAndTextDirection(DictionaryValue* localized_strings);
 
-   protected:
-    friend class base::RefCountedThreadSafe<DataSource>;
-
-    virtual ~DataSource() {}
-
    private:
     // The name of this source.
     // E.g., for favicons, this could be "favicon", which results in paths for
diff --git a/chrome/browser/dom_ui/dom_ui_favicon_source.h b/chrome/browser/dom_ui/dom_ui_favicon_source.h
index 0d42eaf..6556c39 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.h
+++ b/chrome/browser/dom_ui/dom_ui_favicon_source.h
@@ -20,6 +20,7 @@ class Profile;
 class DOMUIFavIconSource : public ChromeURLDataManager::DataSource {
  public:
   explicit DOMUIFavIconSource(Profile* profile);
+  virtual ~DOMUIFavIconSource() { }
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -39,8 +40,6 @@ class DOMUIFavIconSource : public ChromeURLDataManager::DataSource {
                               GURL url);
 
  private:
-  virtual ~DOMUIFavIconSource() {}
-
   Profile* profile_;
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source.h b/chrome/browser/dom_ui/dom_ui_theme_source.h
index f20d104..65f83e7 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.h
+++ b/chrome/browser/dom_ui/dom_ui_theme_source.h
@@ -26,9 +26,6 @@ class DOMUIThemeSource : public ChromeURLDataManager::DataSource {
 
   virtual MessageLoop* MessageLoopForRequestPath(const std::string& path) const;
 
- protected:
-  virtual ~DOMUIThemeSource() {}
-
  private:
   // Populate new_tab_css_ and new_incognito_tab_css.  These must be called
   // from the UI thread because they involve profile and theme access.
diff --git a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
index 09e98b2..f33bf27 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
@@ -26,9 +26,6 @@ class MockThemeSource : public DOMUIThemeSource {
 
   int result_request_id_;
   size_t result_data_size_;
-
- private:
-  ~MockThemeSource() {}
 };
 
 class DOMUISourcesTest : public testing::Test {
diff --git a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
index 03263b2..48f2879 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
@@ -40,8 +40,6 @@ class DOMUIThumbnailSource : public ChromeURLDataManager::DataSource,
                                 scoped_refptr<RefCountedBytes> data);
 
  private:
-  ~DOMUIThumbnailSource() {}
-
   // NotificationObserver implementation
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc
index 5dff5b9..39adf47e 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -41,8 +41,6 @@ class DownloadsUIHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
-  ~DownloadsUIHTMLSource() {}
-
   DISALLOW_COPY_AND_ASSIGN(DownloadsUIHTMLSource);
 };
 
diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc
index 182c20a..0a07074 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -50,8 +50,6 @@ class FileBrowseUIHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
-  ~FileBrowseUIHTMLSource() {}
-
   DISALLOW_COPY_AND_ASSIGN(FileBrowseUIHTMLSource);
 };
 
diff --git a/chrome/browser/dom_ui/fileicon_source.h b/chrome/browser/dom_ui/fileicon_source.h
index a9f43d7..a13c207 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/dom_ui/fileicon_source.h
@@ -18,6 +18,7 @@ class GURL;
 class FileIconSource : public ChromeURLDataManager::DataSource {
  public:
   explicit FileIconSource();
+  virtual ~FileIconSource();
 
   // Called when the network layer has requested a resource underneath
   // the path we registered.
@@ -34,8 +35,6 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
       SkBitmap* icon);
 
  private:
-  virtual ~FileIconSource();
-
   CancelableRequestConsumerT<int, 0> cancelable_consumer_;
 
   // Raw PNG representation of the favicon to show when the favicon
diff --git a/chrome/browser/dom_ui/history_ui.h b/chrome/browser/dom_ui/history_ui.h
index 990c423..3dc51c4 100644
--- a/chrome/browser/dom_ui/history_ui.h
+++ b/chrome/browser/dom_ui/history_ui.h
@@ -29,8 +29,6 @@ class HistoryUIHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
-  ~HistoryUIHTMLSource() {}
-
   DISALLOW_COPY_AND_ASSIGN(HistoryUIHTMLSource);
 };
 
diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc
index 9dd8dc84..10addde 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -144,8 +144,6 @@ class IncognitoTabHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
-  ~IncognitoTabHTMLSource() {}
-
   // Populate full_html_.  This must be called from the UI thread because it
   // involves profile access.
   //
diff --git a/chrome/browser/dom_ui/new_tab_ui.h b/chrome/browser/dom_ui/new_tab_ui.h
index 1feac2a..e4b494c 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -78,8 +78,6 @@ class NewTabUI : public DOMUI,
     static bool first_run() { return first_run_; }
 
    private:
-    ~NewTabHTMLSource() {}
-
     // In case a file path to the new tab page was provided this tries to load
     // the file and returns the file content if successful. This returns an
     // empty string in case of failure.
diff --git a/chrome/browser/dom_ui/print_ui.h b/chrome/browser/dom_ui/print_ui.h
index 508a6c4..8443da4 100644
--- a/chrome/browser/dom_ui/print_ui.h
+++ b/chrome/browser/dom_ui/print_ui.h
@@ -31,8 +31,6 @@ class PrintUIHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
-  ~PrintUIHTMLSource() {}
-
   DISALLOW_COPY_AND_ASSIGN(PrintUIHTMLSource);
 };