Revert "Revert r31175 r31176 r31187"

The bustage seems to be a WebKit change upstream. It is not reverted in
WebKit and merger. So bring the innocent change back in.

TBR=jam
TEST=green tree

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

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

12 files changed, 29 insertions, 3 deletions

diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.h b/chrome/browser/dom_ui/chrome_url_data_manager.h
index c159190..f553a3f 100644
--- a/chrome/browser/dom_ui/chrome_url_data_manager.h
+++ b/chrome/browser/dom_ui/chrome_url_data_manager.h
@@ -44,7 +44,6 @@ 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
@@ -76,6 +75,11 @@ 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 6556c39..0d42eaf 100644
--- a/chrome/browser/dom_ui/dom_ui_favicon_source.h
+++ b/chrome/browser/dom_ui/dom_ui_favicon_source.h
@@ -20,7 +20,6 @@ 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.
@@ -40,6 +39,8 @@ 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 65f83e7..f20d104 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source.h
+++ b/chrome/browser/dom_ui/dom_ui_theme_source.h
@@ -26,6 +26,9 @@ 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 f33bf27..09e98b2 100644
--- a/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
+++ b/chrome/browser/dom_ui/dom_ui_theme_source_unittest.cc
@@ -26,6 +26,9 @@ 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 48f2879..03263b2 100644
--- a/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
+++ b/chrome/browser/dom_ui/dom_ui_thumbnail_source.h
@@ -40,6 +40,8 @@ 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 39adf47e..5dff5b9 100644
--- a/chrome/browser/dom_ui/downloads_ui.cc
+++ b/chrome/browser/dom_ui/downloads_ui.cc
@@ -41,6 +41,8 @@ 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 0a07074..182c20a 100644
--- a/chrome/browser/dom_ui/filebrowse_ui.cc
+++ b/chrome/browser/dom_ui/filebrowse_ui.cc
@@ -50,6 +50,8 @@ 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 a13c207..a9f43d7 100644
--- a/chrome/browser/dom_ui/fileicon_source.h
+++ b/chrome/browser/dom_ui/fileicon_source.h
@@ -18,7 +18,6 @@ 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.
@@ -35,6 +34,8 @@ 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 3dc51c4..990c423 100644
--- a/chrome/browser/dom_ui/history_ui.h
+++ b/chrome/browser/dom_ui/history_ui.h
@@ -29,6 +29,8 @@ 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 10addde..9dd8dc84 100644
--- a/chrome/browser/dom_ui/new_tab_ui.cc
+++ b/chrome/browser/dom_ui/new_tab_ui.cc
@@ -144,6 +144,8 @@ 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 e4b494c..1feac2a 100644
--- a/chrome/browser/dom_ui/new_tab_ui.h
+++ b/chrome/browser/dom_ui/new_tab_ui.h
@@ -78,6 +78,8 @@ 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 8443da4..508a6c4 100644
--- a/chrome/browser/dom_ui/print_ui.h
+++ b/chrome/browser/dom_ui/print_ui.h
@@ -31,6 +31,8 @@ class PrintUIHTMLSource : public ChromeURLDataManager::DataSource {
   }
 
  private:
+  ~PrintUIHTMLSource() {}
+
   DISALLOW_COPY_AND_ASSIGN(PrintUIHTMLSource);
 };