Update Chromium to branch 1650 (31.0.1650.63)

Change-Id: I57d8c832eaec1eb2364e0a8e7352a6dd354db99f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>

17 files changed, 25 insertions, 28 deletions

diff --git a/chromium/printing/DEPS b/chromium/printing/DEPS
index 9c706cd6ef0..00c20e2d211 100644
--- a/chromium/printing/DEPS
+++ b/chromium/printing/DEPS
@@ -4,6 +4,7 @@ include_rules = [
   "+third_party/icu/source/i18n/unicode",
   "+third_party/skia",
   "+ui/aura",
+  "+ui/base/resource",
   "+ui/base/text",
   "+ui/gfx",
   "+win8/util",
diff --git a/chromium/printing/backend/cups_helper.cc b/chromium/printing/backend/cups_helper.cc
index 1c143a5dd51..748625d7ac0 100644
--- a/chromium/printing/backend/cups_helper.cc
+++ b/chromium/printing/backend/cups_helper.cc
@@ -35,7 +35,7 @@ void ParseLpOptions(const base::FilePath& filepath,
                     const std::string& printer_name,
                     int* num_options, cups_option_t** options) {
   std::string content;
-  if (!file_util::ReadFileToString(filepath, &content))
+  if (!base::ReadFileToString(filepath, &content))
     return;
 
   const char kDest[] = "dest";
diff --git a/chromium/printing/backend/print_backend.cc b/chromium/printing/backend/print_backend.cc
index 958343f4ac8..29dc1fd5e9b 100644
--- a/chromium/printing/backend/print_backend.cc
+++ b/chromium/printing/backend/print_backend.cc
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 #include "third_party/icu/source/common/unicode/uchar.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/gfx/text_elider.h"
 
 namespace {
 
@@ -44,7 +44,7 @@ string16 PrintBackend::SimplifyDocumentTitle(const string16& title) {
     std::remove_if(no_controls.begin(), no_controls.end(), &u_iscntrl),
     no_controls.end());
   string16 result;
-  ui::ElideString(no_controls, kMaxDocumentTitleLength, &result);
+  gfx::ElideString(no_controls, kMaxDocumentTitleLength, &result);
   return result;
 }
 
diff --git a/chromium/printing/backend/print_backend_cups.cc b/chromium/printing/backend/print_backend_cups.cc
index 44c38bb96c3..2eb21438078 100644
--- a/chromium/printing/backend/print_backend_cups.cc
+++ b/chromium/printing/backend/print_backend_cups.cc
@@ -251,7 +251,7 @@ bool PrintBackendCUPS::GetPrinterCapsAndDefaults(
   }
 
   std::string content;
-  bool res = file_util::ReadFileToString(ppd_path, &content);
+  bool res = base::ReadFileToString(ppd_path, &content);
 
   base::DeleteFile(ppd_path, false);
 
diff --git a/chromium/printing/emf_win.cc b/chromium/printing/emf_win.cc
index 98c8f8ffa6f..3003a2f4d98 100644
--- a/chromium/printing/emf_win.cc
+++ b/chromium/printing/emf_win.cc
@@ -517,7 +517,7 @@ bool Emf::Record::SafePlayback(Emf::EnumerationContext* context) const {
   return res;
 }
 
-SkDevice* Emf::StartPageForVectorCanvas(
+SkBaseDevice* Emf::StartPageForVectorCanvas(
     const gfx::Size& page_size, const gfx::Rect& content_area,
     const float& scale_factor) {
   if (!StartPage(page_size, content_area, scale_factor))
diff --git a/chromium/printing/emf_win.h b/chromium/printing/emf_win.h
index 3516f4efb7d..fa274091f20 100644
--- a/chromium/printing/emf_win.h
+++ b/chromium/printing/emf_win.h
@@ -54,7 +54,7 @@ class PRINTING_EXPORT Emf : public Metafile {
   virtual bool InitFromData(const void* src_buffer,
                             uint32 src_buffer_size) OVERRIDE;
 
-  virtual SkDevice* StartPageForVectorCanvas(
+  virtual SkBaseDevice* StartPageForVectorCanvas(
       const gfx::Size& page_size, const gfx::Rect& content_area,
       const float& scale_factor) OVERRIDE;
   // Inserts a custom GDICOMMENT records indicating StartPage/EndPage calls
diff --git a/chromium/printing/emf_win_unittest.cc b/chromium/printing/emf_win_unittest.cc
index 0f5e6ca8cf9..44f693ee354 100644
--- a/chromium/printing/emf_win_unittest.cc
+++ b/chromium/printing/emf_win_unittest.cc
@@ -95,7 +95,7 @@ TEST_F(EmfPrintingTest, Enumerate) {
   // Load any EMF with an image.
   Emf emf;
   std::string emf_data;
-  file_util::ReadFileToString(emf_file, &emf_data);
+  base::ReadFileToString(emf_file, &emf_data);
   ASSERT_TRUE(emf_data.size());
   EXPECT_TRUE(emf.InitFromData(&emf_data[0], emf_data.size()));
 
diff --git a/chromium/printing/image.cc b/chromium/printing/image.cc
index 47ce089d302..b9c0010e615 100644
--- a/chromium/printing/image.cc
+++ b/chromium/printing/image.cc
@@ -21,7 +21,7 @@ Image::Image(const base::FilePath& path)
     : row_length_(0),
       ignore_alpha_(true) {
   std::string data;
-  file_util::ReadFileToString(path, &data);
+  base::ReadFileToString(path, &data);
   bool success = false;
   if (path.MatchesExtension(FILE_PATH_LITERAL(".png"))) {
     success = LoadPng(data);
diff --git a/chromium/printing/metafile.h b/chromium/printing/metafile.h
index e331069b505..5f771e5f0f8 100644
--- a/chromium/printing/metafile.h
+++ b/chromium/printing/metafile.h
@@ -27,7 +27,7 @@ class Rect;
 class Size;
 }
 
-class SkDevice;
+class SkBaseDevice;
 
 #if defined(OS_CHROMEOS) || defined(OS_ANDROID)
 namespace base {
@@ -87,7 +87,7 @@ class PRINTING_EXPORT Metafile {
   // This method calls StartPage and then returns an appropriate
   // VectorPlatformDevice implementation bound to the context created by
   // StartPage or NULL on error.
-  virtual SkDevice* StartPageForVectorCanvas(
+  virtual SkBaseDevice* StartPageForVectorCanvas(
       const gfx::Size& page_size,
       const gfx::Rect& content_area,
       const float& scale_factor) = 0;
diff --git a/chromium/printing/pdf_metafile_cg_mac.cc b/chromium/printing/pdf_metafile_cg_mac.cc
index cd7c5c7e27b..86687389389 100644
--- a/chromium/printing/pdf_metafile_cg_mac.cc
+++ b/chromium/printing/pdf_metafile_cg_mac.cc
@@ -110,7 +110,7 @@ bool PdfMetafileCg::InitFromData(const void* src_buffer,
   return true;
 }
 
-SkDevice* PdfMetafileCg::StartPageForVectorCanvas(
+SkBaseDevice* PdfMetafileCg::StartPageForVectorCanvas(
     const gfx::Size& page_size, const gfx::Rect& content_area,
     const float& scale_factor) {
   NOTIMPLEMENTED();
diff --git a/chromium/printing/pdf_metafile_cg_mac.h b/chromium/printing/pdf_metafile_cg_mac.h
index 77f703150c6..331129a25b6 100644
--- a/chromium/printing/pdf_metafile_cg_mac.h
+++ b/chromium/printing/pdf_metafile_cg_mac.h
@@ -37,7 +37,7 @@ class PRINTING_EXPORT PdfMetafileCg : public Metafile {
                             uint32 src_buffer_size) OVERRIDE;
 
   // Not implemented on mac.
-  virtual SkDevice* StartPageForVectorCanvas(
+  virtual SkBaseDevice* StartPageForVectorCanvas(
       const gfx::Size& page_size, const gfx::Rect& content_area,
       const float& scale_factor) OVERRIDE;
   virtual bool StartPage(const gfx::Size& page_size,
diff --git a/chromium/printing/pdf_metafile_skia.cc b/chromium/printing/pdf_metafile_skia.cc
index 31c8c741fd4..2242cfc0175 100644
--- a/chromium/printing/pdf_metafile_skia.cc
+++ b/chromium/printing/pdf_metafile_skia.cc
@@ -48,7 +48,7 @@ bool PdfMetafileSkia::InitFromData(const void* src_buffer,
   return data_->pdf_stream_.write(src_buffer, src_buffer_size);
 }
 
-SkDevice* PdfMetafileSkia::StartPageForVectorCanvas(
+SkBaseDevice* PdfMetafileSkia::StartPageForVectorCanvas(
     const gfx::Size& page_size, const gfx::Rect& content_area,
     const float& scale_factor) {
   DCHECK(!page_outstanding_);
diff --git a/chromium/printing/pdf_metafile_skia.h b/chromium/printing/pdf_metafile_skia.h
index c6f19712e12..b44133fddee 100644
--- a/chromium/printing/pdf_metafile_skia.h
+++ b/chromium/printing/pdf_metafile_skia.h
@@ -30,7 +30,7 @@ class PRINTING_EXPORT PdfMetafileSkia : public Metafile {
   virtual bool InitFromData(const void* src_buffer,
                             uint32 src_buffer_size) OVERRIDE;
 
-  virtual SkDevice* StartPageForVectorCanvas(
+  virtual SkBaseDevice* StartPageForVectorCanvas(
       const gfx::Size& page_size,
       const gfx::Rect& content_area,
       const float& scale_factor) OVERRIDE;
diff --git a/chromium/printing/print_settings_initializer.cc b/chromium/printing/print_settings_initializer.cc
index 80fa6366d57..37e5a640c8a 100644
--- a/chromium/printing/print_settings_initializer.cc
+++ b/chromium/printing/print_settings_initializer.cc
@@ -16,7 +16,9 @@
 #include "printing/print_job_constants.h"
 #include "printing/print_settings.h"
 #include "printing/units.h"
-#include "ui/base/text/text_elider.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/gfx/font_list.h"
+#include "ui/gfx/text_elider.h"
 #include "url/gurl.h"
 
 using base::DictionaryValue;
@@ -43,7 +45,11 @@ void PrintSettingsInitializer::InitHeaderFooterStrings(
 
   print_settings->date = date;
   print_settings->title = title;
-  print_settings->url = ui::ElideUrl(GURL(url), gfx::Font(), 0, std::string());
+  const gfx::FontList& default_fonts =
+      ui::ResourceBundle::GetSharedInstance().GetFontList(
+          ui::ResourceBundle::BaseFont);
+  print_settings->url = gfx::ElideUrl(GURL(url), default_fonts, 0,
+                                      std::string());
 }
 
 }  // namespace printing
diff --git a/chromium/printing/printed_document.cc b/chromium/printing/printed_document.cc
index 59cc3856923..fa40e1f3115 100644
--- a/chromium/printing/printed_document.cc
+++ b/chromium/printing/printed_document.cc
@@ -23,8 +23,8 @@
 #include "printing/printed_pages_source.h"
 #include "printing/units.h"
 #include "skia/ext/platform_device.h"
-#include "ui/base/text/text_elider.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/text_elider.h"
 
 namespace {
 
diff --git a/chromium/printing/printing.gyp b/chromium/printing/printing.gyp
index 890e5bfe587..8834611b36b 100644
--- a/chromium/printing/printing.gyp
+++ b/chromium/printing/printing.gyp
@@ -242,6 +242,7 @@
       'dependencies': [
         'printing',
         '../testing/gtest.gyp:gtest',
+        '../base/base.gyp:run_all_unittests',
         '../base/base.gyp:test_support_base',
         '../ui/ui.gyp:ui',
       ],
@@ -254,14 +255,12 @@
         'page_setup_unittest.cc',
         'pdf_metafile_cg_mac_unittest.cc',
         'printed_page_unittest.cc',
-        'run_all_unittests.cc',
         'units_unittest.cc',
       ],
       'conditions': [
         ['enable_printing==0', {
           'sources/': [
             ['exclude', '.'],
-            ['include', 'run_all_unittests.cc'],
           ],
         }],
         ['toolkit_uses_gtk == 0', {'sources/': [['exclude', '_gtk_unittest\\.cc$']]}],
diff --git a/chromium/printing/run_all_unittests.cc b/chromium/printing/run_all_unittests.cc
deleted file mode 100644
index b715a328b99..00000000000
--- a/chromium/printing/run_all_unittests.cc
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2006-2008 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 "base/test/test_suite.h"
-
-int main(int argc, char** argv) {
-  return base::TestSuite(argc, argv).Run();
-}