Remove the discrepencies between chrome and android_webview print

android_webview/browser/renderer_host/print_manager.cc

 // Copyright 2013 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.
 
 #include "android_webview/browser/renderer_host/print_manager.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/common/print_messages.h"
 #include "android_webview/common/render_view_messages.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/callback.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "content/public/browser/browser_thread.h"
 #include "printing/print_settings.h"
 
 using content::BrowserThread;
 using printing::PrintSettings;
 
+DEFINE_WEB_CONTENTS_USER_DATA_KEY(android_webview::PrintManager);
+
 namespace android_webview {
 
+// static
+PrintManager* PrintManager::CreateForWebContents(
+    content::WebContents* contents,
+    PrintSettings* settings,
+    int fd,
+    PrintManagerDelegate* delegate) {
+  PrintManager* print_manager =
+      new PrintManager(contents, settings, fd, delegate);
+  contents->SetUserData(UserDataKey(), print_manager);
+  return print_manager;
+}
+
+

[hush (inactive), 2015/01/14 01:55:47]

stale line.

[sgurun-gerrit only, 2015/01/14 02:03:17]

Done.

 PrintManager::PrintManager(content::WebContents* contents,
                            PrintSettings* settings,
                            int fd,
                            PrintManagerDelegate* delegate)
     : content::WebContentsObserver(contents),
       settings_(settings),
       fd_(fd),
       delegate_(delegate),
       number_pages_(0),
       cookie_(1),
       printing_(false) {
   DCHECK(delegate_);
 }
 
 PrintManager::~PrintManager() {}
 
 bool PrintManager::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PrintManager, message)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetPrintedPagesCount,
                         OnDidGetPrintedPagesCount)
     IPC_MESSAGE_HANDLER(PrintHostMsg_DidGetDocumentCookie,
                         OnDidGetDocumentCookie)
     IPC_MESSAGE_HANDLER(PrintHostMsg_PrintingFailed, OnPrintingFailed)
     IPC_MESSAGE_HANDLER_DELAY_REPLY(PrintHostMsg_GetDefaultPrintSettings,
                                     OnGetDefaultPrintSettings)
-    IPC_MESSAGE_HANDLER(PrintHostMsg_AllocateTempFileForPrinting,
-                        OnAllocateTempFileForPrinting)
-    IPC_MESSAGE_HANDLER(PrintHostMsg_TempFileForPrintingWritten,
-                        OnTempFileForPrintingWritten)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled ? true : WebContentsObserver::OnMessageReceived(message);
 }
 
 void PrintManager::OnAllocateTempFileForPrinting(
     base::FileDescriptor* temp_file_fd,
     int* sequence_number) {
   // we don't really use the sequence number.
@@ skipping 72 matching lines @@
 bool PrintManager::PrintNow() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (printing_)
     return false;
 
   printing_ = true;
   return Send(new PrintMsg_PrintPages(routing_id()));
 }
 
 }  // namespace android_webview