Allow overriding WebUIFactory when test flag is set.

chrome/browser/ui/webui/chrome_web_ui_factory.h

Index: chrome/browser/ui/webui/chrome_web_ui_factory.h
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.h b/chrome/browser/ui/webui/chrome_web_ui_factory.h
index 0214baaa45db7936386db8039606ccc140f35dce..e549ce5f9838e72659aeff87bd2f029a1c51ad2e 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.h
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.h
@@ -35,16 +35,18 @@ class ChromeWebUIFactory : public content::WebUIFactory {
 
   static ChromeWebUIFactory* GetInstance();
 
- private:
+ protected:
+  DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeWebUIFactory);

[Lei Zhang (Do not use), 2011/05/24 18:00:06]

nit: this should be last.

[Sheridan Rawlins, 2011/05/24 20:17:22]

Ok, based upon Evan's comments and the example, I changed to
DISALLOW_COPY_AND_ASSIGN, leaving the constructor in the protected section so
that the subclass could instantiate itself.

On 2011/05/24 18:00:06, thestig wrote:

+
   virtual ~ChromeWebUIFactory();
 
+ private:
+
   friend struct DefaultSingletonTraits<ChromeWebUIFactory>;
 
   // Gets the data for the favicon for a WebUI page. Returns NULL if the WebUI
   // does not have a favicon.
   RefCountedMemory* GetFaviconResourceBytes(const GURL& page_url) const;
-
-  DISALLOW_IMPLICIT_CONSTRUCTORS(ChromeWebUIFactory);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_FACTORY_H_