Cleanup LocalDiscoveryUIHandler.

chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.h

 // Copyright (c) 2012 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_EXTENSIONS_API_CLOUD_PRINT_PRIVATE_CLOUD_PRINT_PRIVATE_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_CLOUD_PRINT_PRIVATE_CLOUD_PRINT_PRIVATE_API_H_
 
 #include <string>
 #include <vector>
 
 #include "chrome/browser/extensions/chrome_extension_function.h"
 
 namespace extensions {
 
 namespace api {
 namespace cloud_print_private {
 
 struct UserSettings;
 
 }  // namespace cloud_print_private
 }  // namespace api
 
 
 // For use only in tests.
 class CloudPrintTestsDelegate {
  public:
+  static CloudPrintTestsDelegate* Get();
+
   CloudPrintTestsDelegate();
   virtual ~CloudPrintTestsDelegate();
 
   virtual void SetupConnector(
       const std::string& user_email,
       const std::string& robot_email,
       const std::string& credentials,
       const api::cloud_print_private::UserSettings& user_settings) = 0;
 
   virtual std::string GetHostName() = 0;
 
   virtual std::string GetClientId() = 0;
 
   virtual std::vector<std::string> GetPrinters() = 0;
-
-  static CloudPrintTestsDelegate* instance();
-
- private:
-  // Points to single instance of this class during testing.
-  static CloudPrintTestsDelegate* instance_;
 };
 
 class CloudPrintPrivateSetupConnectorFunction
     : public ChromeAsyncExtensionFunction {
  public:
   DECLARE_EXTENSION_FUNCTION("cloudPrintPrivate.setupConnector",
                              CLOUDPRINTPRIVATE_SETUPCONNECTOR)
 
   CloudPrintPrivateSetupConnectorFunction();
 
@@ skipping 48 matching lines @@
  protected:
   ~CloudPrintPrivateGetClientIdFunction() override;
 
   // ExtensionFunction:
   bool RunAsync() override;
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_CLOUD_PRINT_PRIVATE_CLOUD_PRINT_PRIVATE_API_H_