Stop overloading Init() in NativeMetafile.

BUG=NONE
TEST=NONE

Review URL: http://codereview.chromium.org/6709009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78625 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 22 insertions, 21 deletions

diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc
index fa3ff5f..6c9bed0 100644
--- a/chrome/browser/printing/print_view_manager.cc
+++ b/chrome/browser/printing/print_view_manager.cc
@@ -136,7 +136,7 @@ void PrintViewManager::OnDidPrintPage(
 
   scoped_ptr<NativeMetafile> metafile(NativeMetafileFactory::CreateMetafile());
   if (metafile_must_be_valid) {
-    if (!metafile->Init(shared_buf.memory(), params.data_size)) {
+    if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) {
       NOTREACHED() << "Invalid metafile header";
       tab_contents()->Stop();
       return;
diff --git a/chrome/common/common_param_traits.cc b/chrome/common/common_param_traits.cc
index 6c0fc25..7bc5cfe 100644
--- a/chrome/common/common_param_traits.cc
+++ b/chrome/common/common_param_traits.cc
@@ -368,7 +368,7 @@ bool ParamTraits<printing::NativeMetafile>::Read(
     const Message* m, void** iter, param_type* p) {
   std::vector<uint8> buffer;
   return ReadParam(m, iter, &buffer) &&
-         p->Init(&buffer.front(), static_cast<uint32>(buffer.size()));
+         p->InitFromData(&buffer.front(), static_cast<uint32>(buffer.size()));
 }
 
 void ParamTraits<printing::NativeMetafile>::Log(
diff --git a/chrome/renderer/mock_printer.cc b/chrome/renderer/mock_printer.cc
index be9aec4..808524e 100644
--- a/chrome/renderer/mock_printer.cc
+++ b/chrome/renderer/mock_printer.cc
@@ -140,7 +140,7 @@ void MockPrinter::PrintPage(const ViewHostMsg_DidPrintPage_Params& params) {
   metafile_data.Map(params.data_size);
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init(metafile_data.memory(), params.data_size);
+  metafile->InitFromData(metafile_data.memory(), params.data_size);
   printing::Image image(*metafile);
   MockPrinterPage* page_data = new MockPrinterPage(metafile_data.memory(),
                                                    params.data_size,
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 0c018cd..d858ebc 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -923,7 +923,7 @@ void WebPluginDelegateProxy::Print(gfx::NativeDrawingContext context) {
 #if defined(OS_WIN)
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
-  if (!metafile->Init(memory.memory(), size)) {
+  if (!metafile->InitFromData(memory.memory(), size)) {
     NOTREACHED();
     return;
   }
diff --git a/printing/emf_win.cc b/printing/emf_win.cc
index 1d1dd53..6fea291 100644
--- a/printing/emf_win.cc
+++ b/printing/emf_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -54,7 +54,7 @@ Emf::~Emf() {
   DCHECK(!emf_ && !hdc_);
 }
 
-bool Emf::Init(const void* src_buffer, uint32 src_buffer_size) {
+bool Emf::InitFromData(const void* src_buffer, uint32 src_buffer_size) {
   DCHECK(!emf_ && !hdc_);
   emf_ = SetEnhMetaFileBits(src_buffer_size,
                             reinterpret_cast<const BYTE*>(src_buffer));
diff --git a/printing/emf_win.h b/printing/emf_win.h
index e054db3..5150356 100644
--- a/printing/emf_win.h
+++ b/printing/emf_win.h
@@ -31,7 +31,7 @@ class Emf : public NativeMetafile {
 
   // NativeMetafile methods.
   virtual bool Init() { return true; }
-  virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
+  virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size);
 
   virtual bool StartPage();
   virtual bool FinishPage();
diff --git a/printing/emf_win_unittest.cc b/printing/emf_win_unittest.cc
index 9ae9323..2f4e2ae 100644
--- a/printing/emf_win_unittest.cc
+++ b/printing/emf_win_unittest.cc
@@ -62,7 +62,7 @@ TEST(EmfTest, DC) {
   // Playback the data.
   hdc = CreateCompatibleDC(NULL);
   EXPECT_TRUE(hdc);
-  EXPECT_TRUE(emf.Init(&data.front(), size));
+  EXPECT_TRUE(emf.InitFromData(&data.front(), size));
   RECT output_rect = {0, 0, 10, 10};
   EXPECT_TRUE(emf.Playback(hdc, &output_rect));
   EXPECT_TRUE(DeleteDC(hdc));
@@ -94,7 +94,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
   std::string emf_data;
   file_util::ReadFileToString(emf_file, &emf_data);
   ASSERT_TRUE(emf_data.size());
-  EXPECT_TRUE(emf.Init(&emf_data[0], emf_data.size()));
+  EXPECT_TRUE(emf.InitFromData(&emf_data[0], emf_data.size()));
 
   // This will print to file. The reason is that when running inside a
   // unit_test, printing::PrintingContext automatically dumps its files to the
@@ -148,7 +148,7 @@ TEST_F(EmfPrintingTest, PageBreak) {
   di.cbSize = sizeof(DOCINFO);
   di.lpszDocName = L"Test Job";
   int job_id = ::StartDoc(dc.Get(), &di);
-  EXPECT_TRUE(emf.Init(&data.front(), size));
+  EXPECT_TRUE(emf.InitFromData(&data.front(), size));
   EXPECT_TRUE(emf.SafePlayback(dc.Get()));
   ::EndDoc(dc.Get());
   // Since presumably the printer is not real, let us just delete the job from
diff --git a/printing/image.cc b/printing/image.cc
index a99e307..7c2d8d2 100644
--- a/printing/image.cc
+++ b/printing/image.cc
@@ -148,7 +148,7 @@ bool Image::LoadMetafile(const std::string& data) {
   DCHECK(!data.empty());
   scoped_ptr<NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
-  metafile->Init(data.data(), data.size());
+  metafile->InitFromData(data.data(), data.size());
   return LoadMetafile(*metafile);
 }
 
diff --git a/printing/native_metafile.h b/printing/native_metafile.h
index 65f9f4c..a076b32 100644
--- a/printing/native_metafile.h
+++ b/printing/native_metafile.h
@@ -48,7 +48,7 @@ class NativeMetafile {
   // Initializes the metafile with the data in |src_buffer|. Returns true
   // on success.
   // Note: It should only be called from within the browser process.
-  virtual bool Init(const void* src_buffer, uint32 src_buffer_size) = 0;
+  virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size) = 0;
 
 #if defined(OS_WIN)
   // Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls
diff --git a/printing/pdf_metafile_mac.cc b/printing/pdf_metafile_mac.cc
index 36f4947..6c53de9 100644
--- a/printing/pdf_metafile_mac.cc
+++ b/printing/pdf_metafile_mac.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -47,7 +47,7 @@ bool PdfMetafile::Init() {
   return true;
 }
 
-bool PdfMetafile::Init(const void* src_buffer, uint32 src_buffer_size) {
+bool PdfMetafile::InitFromData(const void* src_buffer, uint32 src_buffer_size) {
   DCHECK(!context_.get());
   DCHECK(!pdf_data_.get());
 
diff --git a/printing/pdf_metafile_mac.h b/printing/pdf_metafile_mac.h
index b1d3944..d1dbbef 100644
--- a/printing/pdf_metafile_mac.h
+++ b/printing/pdf_metafile_mac.h
@@ -31,7 +31,7 @@ class PdfMetafile : public NativeMetafile {
 
   // NativeMetafile methods.
   virtual bool Init();
-  virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
+  virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size);
 
   virtual CGContextRef StartPage(const gfx::Size& page_size,
                                  const gfx::Point& content_origin,
diff --git a/printing/pdf_metafile_mac_unittest.cc b/printing/pdf_metafile_mac_unittest.cc
index b45370d..b4b6996 100644
--- a/printing/pdf_metafile_mac_unittest.cc
+++ b/printing/pdf_metafile_mac_unittest.cc
@@ -44,7 +44,7 @@ TEST(PdfMetafileTest, Pdf) {
 
   // Test browser-side constructor.
   printing::PdfMetafile pdf2;
-  EXPECT_TRUE(pdf2.Init(&buffer.front(), size));
+  EXPECT_TRUE(pdf2.InitFromData(&buffer.front(), size));
 
   // Get the first 4 characters from pdf2.
   std::vector<char> buffer2(4, 0);
diff --git a/printing/pdf_ps_metafile_cairo.cc b/printing/pdf_ps_metafile_cairo.cc
index faab29f4..cfa89e4 100644
--- a/printing/pdf_ps_metafile_cairo.cc
+++ b/printing/pdf_ps_metafile_cairo.cc
@@ -113,7 +113,8 @@ bool PdfPsMetafile::Init() {
   return true;
 }
 
-bool PdfPsMetafile::Init(const void* src_buffer, uint32 src_buffer_size) {
+bool PdfPsMetafile::InitFromData(const void* src_buffer,
+                                 uint32 src_buffer_size) {
   // We need to check at least these two members to ensure Init() has not been
   // called before
   DCHECK(!context_);
@@ -131,7 +132,7 @@ bool PdfPsMetafile::SetRawData(const void* src_buffer,
                                uint32 src_buffer_size) {
   if (!context_) {
     // If Init has not already been called, just call Init()
-    return Init(src_buffer, src_buffer_size);
+    return InitFromData(src_buffer, src_buffer_size);
   }
   // If a context has already been created, remember this data in
   // raw_override_data_
diff --git a/printing/pdf_ps_metafile_cairo.h b/printing/pdf_ps_metafile_cairo.h
index 6cfe5ff..1294862 100644
--- a/printing/pdf_ps_metafile_cairo.h
+++ b/printing/pdf_ps_metafile_cairo.h
@@ -23,7 +23,7 @@ class PdfPsMetafile : public NativeMetafile {
 
   // NativeMetafile methods.
   virtual bool Init();
-  virtual bool Init(const void* src_buffer, uint32 src_buffer_size);
+  virtual bool InitFromData(const void* src_buffer, uint32 src_buffer_size);
 
   virtual cairo_t* StartPage(const gfx::Size& page_size,
                              double margin_top_in_points,
diff --git a/printing/pdf_ps_metafile_cairo_unittest.cc b/printing/pdf_ps_metafile_cairo_unittest.cc
index 048c98c..e180538 100644
--- a/printing/pdf_ps_metafile_cairo_unittest.cc
+++ b/printing/pdf_ps_metafile_cairo_unittest.cc
@@ -56,7 +56,7 @@ TEST_F(PdfPsTest, Pdf) {
 
   // Tests another constructor.
   printing::PdfPsMetafile pdf2;
-  EXPECT_TRUE(pdf2.Init(&buffer.front(), size));
+  EXPECT_TRUE(pdf2.InitFromData(&buffer.front(), size));
 
   // Tries to get the first 4 characters from pdf2.
   std::vector<char> buffer2(4, 0x00);
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index a198289..b0fa47e 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1096,7 +1096,7 @@ bool PluginInstance::PrintPDFOutput(PP_Resource print_output,
   scoped_ptr<printing::NativeMetafile> metafile(
       printing::NativeMetafileFactory::CreateMetafile());
   // Create a PDF metafile and render from there into the passed in context.
-  if (metafile->Init(buffer->mapped_buffer(), buffer->size())) {
+  if (metafile->InitFromData(buffer->mapped_buffer(), buffer->size())) {
     // Flip the transform.
     CGContextSaveGState(canvas);
     CGContextTranslateCTM(canvas, 0,