Switch chrome code to use content::WebUI interface instead of WebUI concrete class. The latter wi...

chrome/browser/printing/print_dialog_cloud_internal.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_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
 #define CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 13 matching lines @@
 class ListValue;
 class StringValue;
 class Value;
 }
 
 namespace internal_cloud_print_helpers {
 
 // Small class to virtualize a few functions to aid with unit testing.
 class CloudPrintDataSenderHelper {
  public:
-  explicit CloudPrintDataSenderHelper(WebUI* web_ui) : web_ui_(web_ui) {}
+  explicit CloudPrintDataSenderHelper(content::WebUI* web_ui)
+      : web_ui_(web_ui) {}
   virtual ~CloudPrintDataSenderHelper() {}
 
-  // Virtualize the overrides of these three functions from WebUI to
-  // facilitate unit testing.
-  virtual void CallJavascriptFunction(const std::wstring& function_name);
-  virtual void CallJavascriptFunction(const std::wstring& function_name,
-                                      const base::Value& arg);
-  virtual void CallJavascriptFunction(const std::wstring& function_name,
-                                      const base::Value& arg1,
-                                      const base::Value& arg2);
-  virtual void CallJavascriptFunction(const std::wstring& function_name,
-                                      const base::Value& arg1,
-                                      const base::Value& arg2,
-                                      const base::Value& arg3);
+  void CallJavascriptFunction(const std::wstring& function_name);

[Elliot Glaysher, 2012/01/18 01:34:08]

Is it really ok to devirtualize these methods? MockCloudPrintDataSenderHelper
overrides them.

[jam, 2012/01/18 01:41:38]

no, that was me learning about why it's not ok to do this :) i've reverted this
in the second patchset

+  void CallJavascriptFunction(const std::wstring& function_name,
+                              const base::Value& arg);
+  void CallJavascriptFunction(const std::wstring& function_name,
+                              const base::Value& arg1,
+                              const base::Value& arg2);
+  void CallJavascriptFunction(const std::wstring& function_name,
+                              const base::Value& arg1,
+                              const base::Value& arg2,
+                              const base::Value& arg3);
 
  private:
-  WebUI* web_ui_;
+  content::WebUI* web_ui_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPrintDataSenderHelper);
 };
 
 // Small helper class to get the print data loaded in from the PDF
 // file (on the FILE thread) and send it to the print dialog contents
 // (on the IO thread), allowing for cancellation.
 class CloudPrintDataSender
     : public base::RefCountedThreadSafe<CloudPrintDataSender> {
  public:
@@ skipping 142 matching lines @@
                       const string16& print_ticket,
                       const std::string& file_type,
                       bool modal,
                       bool delete_on_close);
 
 void Delete(const FilePath& path_to_file);
 
 }  // namespace internal_cloud_print_helpers
 
 #endif  // CHROME_BROWSER_PRINTING_PRINT_DIALOG_CLOUD_INTERNAL_H_