summaryrefslogtreecommitdiffstats
path: root/chrome/browser/captive_portal
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 15:25:15 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-02 15:25:15 +0000
commit761fa4704b79bb85722cef092c6a8c7f0ff55287 (patch)
treefee30920cad1d7c0828f602e6d311900ad323abd /chrome/browser/captive_portal
parent896ff9b6181832710c42efe84bcd1959611fb3a5 (diff)
downloadchromium_src-761fa4704b79bb85722cef092c6a8c7f0ff55287.zip
chromium_src-761fa4704b79bb85722cef092c6a8c7f0ff55287.tar.gz
chromium_src-761fa4704b79bb85722cef092c6a8c7f0ff55287.tar.bz2
chrome/browser: Migrate from googleurl/ includes to url/ ones. Part 1
BUG=229660 TBR=darin@chromium.org Review URL: https://chromiumcodereview.appspot.com/18054023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/captive_portal')
-rw-r--r--chrome/browser/captive_portal/captive_portal_detector_unittest.cc2
-rw-r--r--chrome/browser/captive_portal/captive_portal_service.h2
-rw-r--r--chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/captive_portal/captive_portal_detector_unittest.cc b/chrome/browser/captive_portal/captive_portal_detector_unittest.cc
index 6e22244..44f4b3e 100644
--- a/chrome/browser/captive_portal/captive_portal_detector_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_detector_unittest.cc
@@ -10,10 +10,10 @@
#include "base/time/time.h"
#include "chrome/browser/captive_portal/testing_utils.h"
#include "chrome/test/base/testing_profile.h"
-#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
#include "net/url_request/url_fetcher.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace captive_portal {
diff --git a/chrome/browser/captive_portal/captive_portal_service.h b/chrome/browser/captive_portal/captive_portal_service.h
index 87e2b1f..c8b5970 100644
--- a/chrome/browser/captive_portal/captive_portal_service.h
+++ b/chrome/browser/captive_portal/captive_portal_service.h
@@ -13,8 +13,8 @@
#include "base/timer/timer.h"
#include "chrome/browser/captive_portal/captive_portal_detector.h"
#include "components/browser_context_keyed_service/browser_context_keyed_service.h"
-#include "googleurl/src/gurl.h"
#include "net/base/backoff_entry.h"
+#include "url/gurl.h"
class Profile;
diff --git a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
index 522adb8..feebe41 100644
--- a/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
+++ b/chrome/browser/captive_portal/captive_portal_tab_reloader_unittest.cc
@@ -12,12 +12,12 @@
#include "content/public/browser/interstitial_page.h"
#include "content/public/browser/interstitial_page_delegate.h"
#include "content/public/browser/web_contents.h"
-#include "googleurl/src/gurl.h"
#include "net/base/net_errors.h"
#include "net/cert/cert_status_flags.h"
#include "net/ssl/ssl_info.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace captive_portal {