summaryrefslogtreecommitdiffstats
path: root/extensions
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 /extensions
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 'extensions')
-rw-r--r--extensions/common/event_filtering_info.h2
-rw-r--r--extensions/common/matcher/regex_set_matcher_unittest.cc6
-rw-r--r--extensions/common/matcher/url_matcher.cc4
-rw-r--r--extensions/common/matcher/url_matcher_factory_unittest.cc2
-rw-r--r--extensions/common/matcher/url_matcher_unittest.cc2
-rw-r--r--extensions/common/url_pattern.cc4
-rw-r--r--extensions/common/url_pattern_set.cc2
-rw-r--r--extensions/common/url_pattern_set_unittest.cc2
-rw-r--r--extensions/common/url_pattern_unittest.cc2
9 files changed, 13 insertions, 13 deletions
diff --git a/extensions/common/event_filtering_info.h b/extensions/common/event_filtering_info.h
index a489586..86309ab 100644
--- a/extensions/common/event_filtering_info.h
+++ b/extensions/common/event_filtering_info.h
@@ -6,7 +6,7 @@
#define EXTENSIONS_COMMON_EVENT_FILTERING_INFO_H_
#include "base/memory/scoped_ptr.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
namespace base {
class Value;
diff --git a/extensions/common/matcher/regex_set_matcher_unittest.cc b/extensions/common/matcher/regex_set_matcher_unittest.cc
index 1a924c3..49d312a 100644
--- a/extensions/common/matcher/regex_set_matcher_unittest.cc
+++ b/extensions/common/matcher/regex_set_matcher_unittest.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "extensions/common/matcher/regex_set_matcher.h"
+
#include <set>
#include "base/stl_util.h"
-#include "extensions/common/matcher/regex_set_matcher.h"
-#include "googleurl/src/gurl.h"
-
+#include "url/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
using extensions::StringPattern;
diff --git a/extensions/common/matcher/url_matcher.cc b/extensions/common/matcher/url_matcher.cc
index 4aa83d6..be3057a 100644
--- a/extensions/common/matcher/url_matcher.cc
+++ b/extensions/common/matcher/url_matcher.cc
@@ -9,8 +9,8 @@
#include "base/logging.h"
#include "content/public/common/url_constants.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_canon.h"
+#include "url/gurl.h"
+#include "url/url_canon.h"
namespace extensions {
diff --git a/extensions/common/matcher/url_matcher_factory_unittest.cc b/extensions/common/matcher/url_matcher_factory_unittest.cc
index 0b4def3..733e1b8 100644
--- a/extensions/common/matcher/url_matcher_factory_unittest.cc
+++ b/extensions/common/matcher/url_matcher_factory_unittest.cc
@@ -9,8 +9,8 @@
#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "extensions/common/matcher/url_matcher_constants.h"
-#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace extensions {
diff --git a/extensions/common/matcher/url_matcher_unittest.cc b/extensions/common/matcher/url_matcher_unittest.cc
index 1b194ed..29b7c89 100644
--- a/extensions/common/matcher/url_matcher_unittest.cc
+++ b/extensions/common/matcher/url_matcher_unittest.cc
@@ -5,8 +5,8 @@
#include "extensions/common/matcher/url_matcher.h"
#include "base/strings/string_util.h"
-#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace extensions {
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index fe1f269..5400567 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -10,8 +10,8 @@
#include "base/strings/string_util.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_util.h"
+#include "url/gurl.h"
+#include "url/url_util.h"
const char URLPattern::kAllUrlsPattern[] = "<all_urls>";
diff --git a/extensions/common/url_pattern_set.cc b/extensions/common/url_pattern_set.cc
index 0afe111..87a752c 100644
--- a/extensions/common/url_pattern_set.cc
+++ b/extensions/common/url_pattern_set.cc
@@ -13,7 +13,7 @@
#include "content/public/common/url_constants.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/url_pattern.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
namespace extensions {
diff --git a/extensions/common/url_pattern_set_unittest.cc b/extensions/common/url_pattern_set_unittest.cc
index 725d6bf..89b5435 100644
--- a/extensions/common/url_pattern_set_unittest.cc
+++ b/extensions/common/url_pattern_set_unittest.cc
@@ -5,8 +5,8 @@
#include "extensions/common/url_pattern_set.h"
#include "base/values.h"
-#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
namespace extensions {
diff --git a/extensions/common/url_pattern_unittest.cc b/extensions/common/url_pattern_unittest.cc
index 9d12163..d1cc8c2 100644
--- a/extensions/common/url_pattern_unittest.cc
+++ b/extensions/common/url_pattern_unittest.cc
@@ -5,7 +5,7 @@
#include "base/memory/scoped_ptr.h"
#include "extensions/common/url_pattern.h"
#include "testing/gtest/include/gtest/gtest.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
namespace {