summaryrefslogtreecommitdiffstats
path: root/printing
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-13 20:01:40 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-13 20:01:40 +0000
commit79fe227571a36a13128546564e542a742ebb8523 (patch)
treef712e2e984db2e8f02da51662a148085fffc6ee2 /printing
parentaeda9d98cc0893bbaed8f0d774d1f19a15f55e2a (diff)
downloadchromium_src-79fe227571a36a13128546564e542a742ebb8523.zip
chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.gz
chromium_src-79fe227571a36a13128546564e542a742ebb8523.tar.bz2
Migrate from googleurl/ includes to url/ ones in the remaining top-level directories.
BUG=229660 TBR=darin@chromium.org Review URL: https://codereview.chromium.org/18919005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@211572 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing')
-rw-r--r--printing/backend/cups_helper.cc4
-rw-r--r--printing/backend/print_backend_cups.cc2
-rw-r--r--printing/print_settings_initializer.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/printing/backend/cups_helper.cc b/printing/backend/cups_helper.cc
index b6ce99f..30a4b5b 100644
--- a/printing/backend/cups_helper.cc
+++ b/printing/backend/cups_helper.cc
@@ -9,12 +9,12 @@
#include "base/file_util.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "base/values.h"
-#include "googleurl/src/gurl.h"
#include "printing/backend/print_backend.h"
#include "printing/backend/print_backend_consts.h"
+#include "url/gurl.h"
// This section contains helper code for PPD parsing for semantic capabilities.
namespace {
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 5330db8..b28ca2c 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -22,9 +22,9 @@
#include "base/strings/string_number_conversions.h"
#include "base/synchronization/lock.h"
#include "base/values.h"
-#include "googleurl/src/gurl.h"
#include "printing/backend/cups_helper.h"
#include "printing/backend/print_backend_consts.h"
+#include "url/gurl.h"
#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
const int CUPS_PRINTER_SCANNER = 0x2000000; // Scanner-only device
diff --git a/printing/print_settings_initializer.cc b/printing/print_settings_initializer.cc
index d6f5c0f..80fa636 100644
--- a/printing/print_settings_initializer.cc
+++ b/printing/print_settings_initializer.cc
@@ -13,11 +13,11 @@
#include "base/strings/utf_string_conversions.h"
#include "base/time/time.h"
#include "base/values.h"
-#include "googleurl/src/gurl.h"
#include "printing/print_job_constants.h"
#include "printing/print_settings.h"
#include "printing/units.h"
#include "ui/base/text/text_elider.h"
+#include "url/gurl.h"
using base::DictionaryValue;