Allow overriding WebUIFactory when test flag is set.

chrome/browser/ui/webui/chrome_web_ui_factory.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_FACTORY_H_
 #define CHROME_BROWSER_UI_WEBUI_CHROME_WEB_UI_FACTORY_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
@@ skipping 17 matching lines @@
                                    const GURL& url) const;
 
   // Get the favicon for |page_url| and forward the result to the |request|
   // when loaded.
   void GetFaviconForURL(Profile* profile,
                         FaviconService::GetFaviconRequest* request,
                         const GURL& page_url) const;
 
   static ChromeWebUIFactory* GetInstance();
 
+ 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:
-  virtual ~ChromeWebUIFactory();
 
   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_