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

72 files changed, 80 insertions, 81 deletions

diff --git a/DEPS b/DEPS
index 5218da6..2403fa2 100644
--- a/DEPS
+++ b/DEPS
@@ -506,7 +506,6 @@ include_rules = [
   # Everybody can use some things.
   "+base",
   "+build",
-  "+googleurl",
   "+ipc",
 
   # Everybody can use headers generated by tools/generate_library_loader.
@@ -515,6 +514,8 @@ include_rules = [
   "+testing",
   "+third_party/icu/public",
   "+url",
+  # TODO(tfarina): Temporary, until we finish the migration to url. Remove this!
+  "!googleurl",
 ]
 
 
diff --git a/android_webview/common/aw_hit_test_data.h b/android_webview/common/aw_hit_test_data.h
index 14cce60..d72bcf7 100644
--- a/android_webview/common/aw_hit_test_data.h
+++ b/android_webview/common/aw_hit_test_data.h
@@ -6,7 +6,7 @@
 #define ANDROID_WEBVIEW_COMMON_AW_HIT_TEST_DATA_H_
 
 #include "base/strings/string16.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace android_webview {
 
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
index ff03591..407f62f 100644
--- a/android_webview/native/android_protocol_handler.cc
+++ b/android_webview/native/android_protocol_handler.cc
@@ -13,7 +13,6 @@
 #include "base/android/jni_string.h"
 #include "base/strings/string_util.h"
 #include "content/public/common/url_constants.h"
-#include "googleurl/src/gurl.h"
 #include "jni/AndroidProtocolHandler_jni.h"
 #include "net/base/io_buffer.h"
 #include "net/base/mime_util.h"
@@ -22,6 +21,7 @@
 #include "net/http/http_util.h"
 #include "net/url_request/protocol_intercept_job_factory.h"
 #include "net/url_request/url_request.h"
+#include "url/gurl.h"
 
 using android_webview::InputStream;
 using android_webview::InputStreamImpl;
diff --git a/android_webview/native/aw_contents_client_bridge.cc b/android_webview/native/aw_contents_client_bridge.cc
index 213646f..c044197 100644
--- a/android_webview/native/aw_contents_client_bridge.cc
+++ b/android_webview/native/aw_contents_client_bridge.cc
@@ -9,9 +9,9 @@
 #include "base/android/jni_string.h"
 #include "base/callback.h"
 #include "content/public/browser/browser_thread.h"
-#include "googleurl/src/gurl.h"
 #include "jni/AwContentsClientBridge_jni.h"
 #include "net/cert/x509_certificate.h"
+#include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
diff --git a/android_webview/native/aw_contents_io_thread_client_impl.cc b/android_webview/native/aw_contents_io_thread_client_impl.cc
index 226ba55..81ea0de 100644
--- a/android_webview/native/aw_contents_io_thread_client_impl.cc
+++ b/android_webview/native/aw_contents_io_thread_client_impl.cc
@@ -20,10 +20,9 @@
 #include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "googleurl/src/gurl.h"
-#include "net/url_request/url_request.h"
-
 #include "jni/AwContentsIoThreadClient_jni.h"
+#include "net/url_request/url_request.h"
+#include "url/gurl.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF8ToJavaString;
diff --git a/android_webview/native/aw_quota_manager_bridge_impl.cc b/android_webview/native/aw_quota_manager_bridge_impl.cc
index 4d1ffd8..6427588 100644
--- a/android_webview/native/aw_quota_manager_bridge_impl.cc
+++ b/android_webview/native/aw_quota_manager_bridge_impl.cc
@@ -13,8 +13,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
-#include "googleurl/src/gurl.h"
 #include "jni/AwQuotaManagerBridge_jni.h"
+#include "url/gurl.h"
 #include "webkit/browser/quota/quota_manager.h"
 #include "webkit/common/quota/quota_types.h"
 
diff --git a/android_webview/native/state_serializer_unittests.cc b/android_webview/native/state_serializer_unittests.cc
index cb245f4..f592d29 100644
--- a/android_webview/native/state_serializer_unittests.cc
+++ b/android_webview/native/state_serializer_unittests.cc
@@ -14,8 +14,8 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_state.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 using std::string;
 
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 5e7f370..211c3ef 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -13,13 +13,13 @@
 #include "components/autofill/content/renderer/password_autofill_agent.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/public/renderer/render_thread.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebSecurityPolicy.h"
+#include "url/gurl.h"
 
 namespace android_webview {
 
diff --git a/ash/keyboard_overlay/keyboard_overlay_delegate.h b/ash/keyboard_overlay/keyboard_overlay_delegate.h
index cf46aff..caf8f2a 100644
--- a/ash/keyboard_overlay/keyboard_overlay_delegate.h
+++ b/ash/keyboard_overlay/keyboard_overlay_delegate.h
@@ -9,8 +9,8 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
-#include "googleurl/src/gurl.h"
 #include "ui/web_dialogs/web_dialog_delegate.h"
+#include "url/gurl.h"
 
 namespace views {
 class WebDialogView;
diff --git a/ash/screensaver/screensaver_view.h b/ash/screensaver/screensaver_view.h
index 610c8b0..2e27c4e 100644
--- a/ash/screensaver/screensaver_view.h
+++ b/ash/screensaver/screensaver_view.h
@@ -8,8 +8,8 @@
 #include "ash/ash_export.h"
 #include "base/callback.h"
 #include "content/public/browser/web_contents_observer.h"
-#include "googleurl/src/gurl.h"
 #include "ui/views/widget/widget_delegate.h"
+#include "url/gurl.h"
 
 namespace content {
 class BrowserContent;
diff --git a/chrome/browser/download/download_request_limiter.cc b/chrome/browser/download/download_request_limiter.cc
index b80b86e..c99e029 100644
--- a/chrome/browser/download/download_request_limiter.cc
+++ b/chrome/browser/download/download_request_limiter.cc
@@ -24,7 +24,7 @@
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 using content::BrowserThread;
 using content::NavigationController;
diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h
index 79e1554..f0ea79b 100644
--- a/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h
+++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_delegate.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "chrome/browser/notifications/notification_delegate.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace notifier {
 
diff --git a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc
index c533c17..84643d3 100644
--- a/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc
+++ b/chrome/browser/notifications/sync_notifier/chrome_notifier_service.cc
@@ -13,7 +13,6 @@
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/profiles/profile.h"
-#include "googleurl/src/gurl.h"
 #include "grit/ui_strings.h"
 #include "sync/api/sync_change.h"
 #include "sync/api/sync_change_processor.h"
diff --git a/chrome/browser/ui/search/instant_ntp.cc b/chrome/browser/ui/search/instant_ntp.cc
index e02b659..0bf6f17 100644
--- a/chrome/browser/ui/search/instant_ntp.cc
+++ b/chrome/browser/ui/search/instant_ntp.cc
@@ -12,7 +12,7 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/chrome/common/pnacl_types.h b/chrome/common/pnacl_types.h
index f43beea..2804585 100644
--- a/chrome/common/pnacl_types.h
+++ b/chrome/common/pnacl_types.h
@@ -10,7 +10,7 @@
 // want to pull googleurl into there, since it would be unnecessary bloat.
 
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace nacl {
 // Cache-related information about pexe files, sent from the plugin/renderer
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc
index 59212c3..b99ba0b 100644
--- a/chrome_frame/chrome_frame_activex.cc
+++ b/chrome_frame/chrome_frame_activex.cc
@@ -27,7 +27,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome_frame/utils.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 177b9ac..8728c95 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -42,8 +42,8 @@
 #include "chrome_frame/pin_module.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/utils.h"
-#include "googleurl/src/url_util.h"
 #include "grit/chrome_frame_resources.h"
+#include "url/url_util.h"
 
 using base::win::RegKey;
 
diff --git a/chrome_frame/navigation_constraints.h b/chrome_frame/navigation_constraints.h
index 2aefe5c..5ddaf4c 100644
--- a/chrome_frame/navigation_constraints.h
+++ b/chrome_frame/navigation_constraints.h
@@ -9,7 +9,7 @@
 #include <windows.h>
 
 #include "base/win/scoped_comptr.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 // Provides an interface which controls navigation within ChromeFrame.
 class NavigationConstraints {
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 7843961..149d721 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -37,12 +37,12 @@
 #include "chrome_frame/registry_list_preferences_holder.h"
 #include "chrome_frame/simple_resource_loader.h"
 #include "extensions/common/constants.h"
-#include "googleurl/src/gurl.h"
-#include "googleurl/src/url_canon.h"
 #include "grit/chromium_strings.h"
 #include "net/base/escape.h"
 #include "net/http/http_util.h"
 #include "ui/base/models/menu_model.h"
+#include "url/gurl.h"
+#include "url/url_canon.h"
 
 using base::win::RegKey;
 
diff --git a/chrome_frame/utils.h b/chrome_frame/utils.h
index 8520c7b..d0ee2fd 100644
--- a/chrome_frame/utils.h
+++ b/chrome_frame/utils.h
@@ -17,8 +17,8 @@
 #include "base/metrics/histogram.h"
 #include "base/strings/string16.h"
 #include "base/win/scoped_comptr.h"
-#include "googleurl/src/gurl.h"
 #include "ui/gfx/rect.h"
+#include "url/gurl.h"
 
 class RegistryListPreferencesHolder;
 interface IBrowserService;
diff --git a/chromeos/ime/input_method_descriptor.cc b/chromeos/ime/input_method_descriptor.cc
index 785884e..5e0a3e7 100644
--- a/chromeos/ime/input_method_descriptor.cc
+++ b/chromeos/ime/input_method_descriptor.cc
@@ -8,7 +8,7 @@
 
 #include "base/logging.h"
 #include "base/strings/string_split.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/chromeos/ime/input_method_descriptor.h b/chromeos/ime/input_method_descriptor.h
index fc2cf27..c410719 100644
--- a/chromeos/ime/input_method_descriptor.h
+++ b/chromeos/ime/input_method_descriptor.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "chromeos/chromeos_export.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace chromeos {
 namespace input_method {
diff --git a/cloud_print/service/win/chrome_launcher.cc b/cloud_print/service/win/chrome_launcher.cc
index 2b93338..3f90719 100644
--- a/cloud_print/service/win/chrome_launcher.cc
+++ b/cloud_print/service/win/chrome_launcher.cc
@@ -24,8 +24,8 @@
 #include "cloud_print/service/service_constants.h"
 #include "cloud_print/service/win/service_utils.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/url_util.h"
+#include "url/gurl.h"
 
 namespace {
 
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 {
 
diff --git a/google_apis/gaia/gaia_auth_fetcher.h b/google_apis/gaia/gaia_auth_fetcher.h
index 84cc3e6..1c6ea37 100644
--- a/google_apis/gaia/gaia_auth_fetcher.h
+++ b/google_apis/gaia/gaia_auth_fetcher.h
@@ -12,8 +12,8 @@
 #include "base/memory/scoped_ptr.h"
 #include "google_apis/gaia/gaia_auth_consumer.h"
 #include "google_apis/gaia/google_service_auth_error.h"
-#include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
+#include "url/gurl.h"
 
 // Authenticate a user against the Google Accounts ClientLogin API
 // with various capabilities and return results to a GaiaAuthConsumer.
diff --git a/google_apis/gaia/gaia_auth_fetcher_unittest.cc b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
index 5cce72b..ae48b5b 100644
--- a/google_apis/gaia/gaia_auth_fetcher_unittest.cc
+++ b/google_apis/gaia/gaia_auth_fetcher_unittest.cc
@@ -17,7 +17,6 @@
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/mock_url_fetcher_factory.h"
 #include "google_apis/google_api_keys.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
@@ -27,6 +26,7 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 using ::testing::_;
 using ::testing::Invoke;
diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc
index 36768e23..a8cad86 100644
--- a/google_apis/gaia/gaia_auth_util.cc
+++ b/google_apis/gaia/gaia_auth_util.cc
@@ -10,7 +10,7 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace gaia {
 
diff --git a/google_apis/gaia/gaia_auth_util_unittest.cc b/google_apis/gaia/gaia_auth_util_unittest.cc
index 3ce0efd..4fe58a3 100644
--- a/google_apis/gaia/gaia_auth_util_unittest.cc
+++ b/google_apis/gaia/gaia_auth_util_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "google_apis/gaia/gaia_auth_util.h"
 
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace gaia {
 
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc
index a9ece54..86064d9 100644
--- a/google_apis/gaia/gaia_oauth_client.cc
+++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -10,12 +10,12 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_urls.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "url/gurl.h"
 
 namespace {
 const char kAccessTokenValue[] = "access_token";
diff --git a/google_apis/gaia/gaia_oauth_client_unittest.cc b/google_apis/gaia/gaia_oauth_client_unittest.cc
index 921a61a..0f0b2e0 100644
--- a/google_apis/gaia/gaia_oauth_client_unittest.cc
+++ b/google_apis/gaia/gaia_oauth_client_unittest.cc
@@ -11,7 +11,6 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
@@ -20,6 +19,7 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 using ::testing::_;
 using ::testing::Eq;
diff --git a/google_apis/gaia/gaia_urls.h b/google_apis/gaia/gaia_urls.h
index 34f8d86..28c7279 100644
--- a/google_apis/gaia/gaia_urls.h
+++ b/google_apis/gaia/gaia_urls.h
@@ -8,7 +8,7 @@
 #include <string>
 
 #include "base/memory/singleton.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 // A signleton that provides all the URLs that are used for connecting to GAIA.
 class GaiaUrls {
diff --git a/google_apis/gaia/google_service_auth_error.h b/google_apis/gaia/google_service_auth_error.h
index ddfa2d0..a99e515 100644
--- a/google_apis/gaia/google_service_auth_error.h
+++ b/google_apis/gaia/google_service_auth_error.h
@@ -24,7 +24,7 @@
 
 #include <string>
 
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace base {
 class DictionaryValue;
diff --git a/google_apis/gaia/oauth2_access_token_fetcher.h b/google_apis/gaia/oauth2_access_token_fetcher.h
index 24f4d85..11ac6ea 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher.h
+++ b/google_apis/gaia/oauth2_access_token_fetcher.h
@@ -11,8 +11,8 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
-#include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher_delegate.h"
+#include "url/gurl.h"
 
 class OAuth2AccessTokenFetcherTest;
 
diff --git a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
index 2d4166e..ae022f5 100644
--- a/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
+++ b/google_apis/gaia/oauth2_access_token_fetcher_unittest.cc
@@ -13,7 +13,6 @@
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "google_apis/gaia/oauth2_access_token_consumer.h"
 #include "google_apis/gaia/oauth2_access_token_fetcher.h"
-#include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_fetcher.h"
@@ -24,6 +23,7 @@
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 using content::BrowserThread;
 using net::ResponseCookies;
diff --git a/google_apis/gaia/oauth_request_signer.cc b/google_apis/gaia/oauth_request_signer.cc
index 9a82753..b16744c 100644
--- a/google_apis/gaia/oauth_request_signer.cc
+++ b/google_apis/gaia/oauth_request_signer.cc
@@ -20,7 +20,7 @@
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "crypto/hmac.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/google_apis/gaia/oauth_request_signer_unittest.cc b/google_apis/gaia/oauth_request_signer_unittest.cc
index 40206f6..30358e0 100644
--- a/google_apis/gaia/oauth_request_signer_unittest.cc
+++ b/google_apis/gaia/oauth_request_signer_unittest.cc
@@ -4,8 +4,8 @@
 
 #include "google_apis/gaia/oauth_request_signer.h"
 
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 // This value is used to seed the PRNG at the beginning of a sequence of
 // operations to produce a repeatable sequence.
diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h
index 5249a8b..b920591 100644
--- a/jingle/glue/proxy_resolving_client_socket.h
+++ b/jingle/glue/proxy_resolving_client_socket.h
@@ -12,7 +12,6 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/completion_callback.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
@@ -21,6 +20,7 @@
 #include "net/proxy/proxy_service.h"
 #include "net/socket/stream_socket.h"
 #include "net/ssl/ssl_config_service.h"
+#include "url/gurl.h"
 
 namespace net {
 class ClientSocketFactory;
diff --git a/media/base/android/media_player_android.h b/media/base/android/media_player_android.h
index 6c108973..18831b6 100644
--- a/media/base/android/media_player_android.h
+++ b/media/base/android/media_player_android.h
@@ -10,10 +10,10 @@
 
 #include "base/callback.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "media/base/android/demuxer_stream_player_params.h"
 #include "media/base/media_export.h"
 #include "ui/gl/android/scoped_java_surface.h"
+#include "url/gurl.h"
 
 namespace media {
 
diff --git a/media/base/android/media_player_bridge.h b/media/base/android/media_player_bridge.h
index ba9c05b..421bcb3e 100644
--- a/media/base/android/media_player_bridge.h
+++ b/media/base/android/media_player_bridge.h
@@ -15,9 +15,9 @@
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
-#include "googleurl/src/gurl.h"
 #include "media/base/android/media_player_android.h"
 #include "media/base/android/media_player_listener.h"
+#include "url/gurl.h"
 
 namespace media {
 
diff --git a/media/base/android/media_resource_getter.h b/media/base/android/media_resource_getter.h
index 5389e6b..ea4eccd 100644
--- a/media/base/android/media_resource_getter.h
+++ b/media/base/android/media_resource_getter.h
@@ -10,8 +10,8 @@
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "media/base/media_export.h"
+#include "url/gurl.h"
 
 namespace media {
 
diff --git a/ppapi/shared_impl/ppb_url_util_shared.cc b/ppapi/shared_impl/ppb_url_util_shared.cc
index 7788f4a..b328059 100644
--- a/ppapi/shared_impl/ppb_url_util_shared.cc
+++ b/ppapi/shared_impl/ppb_url_util_shared.cc
@@ -4,11 +4,11 @@
 
 #include "ppapi/shared_impl/ppb_url_util_shared.h"
 
-#include "googleurl/src/gurl.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/shared_impl/var_tracker.h"
+#include "url/gurl.h"
 
 namespace ppapi {
 
diff --git a/ppapi/shared_impl/ppb_url_util_shared.h b/ppapi/shared_impl/ppb_url_util_shared.h
index 873da0c..d45557d 100644
--- a/ppapi/shared_impl/ppb_url_util_shared.h
+++ b/ppapi/shared_impl/ppb_url_util_shared.h
@@ -8,10 +8,10 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "googleurl/src/url_parse.h"
 #include "ppapi/c/dev/ppb_url_util_dev.h"
 #include "ppapi/c/pp_var.h"
 #include "ppapi/shared_impl/ppapi_shared_export.h"
+#include "url/url_parse.h"
 
 class GURL;
 
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;
 
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index d772cfe..edf2c1d 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -18,7 +18,6 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
 #include "jingle/glue/thread_wrapper.h"
 #include "media/base/media.h"
 #include "net/socket/ssl_server_socket.h"
@@ -35,13 +34,14 @@
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
+#include "remoting/client/plugin/pepper_signal_strategy.h"
 #include "remoting/client/plugin/pepper_token_fetcher.h"
 #include "remoting/client/plugin/pepper_view.h"
-#include "remoting/client/plugin/pepper_signal_strategy.h"
 #include "remoting/client/rectangle_update_decoder.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
+#include "url/gurl.h"
 
 // Windows defines 'PostMessage', so we have to undef it.
 #if defined(PostMessage)
diff --git a/remoting/host/dns_blackhole_checker.cc b/remoting/host/dns_blackhole_checker.cc
index 1992a8f..d7f48e3 100644
--- a/remoting/host/dns_blackhole_checker.cc
+++ b/remoting/host/dns_blackhole_checker.cc
@@ -4,9 +4,9 @@
 
 #include "remoting/host/dns_blackhole_checker.h"
 
-#include "googleurl/src/gurl.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "url/gurl.h"
 
 namespace remoting {
 
diff --git a/remoting/host/service_client.cc b/remoting/host/service_client.cc
index edf5e34..fbad41b 100644
--- a/remoting/host/service_client.cc
+++ b/remoting/host/service_client.cc
@@ -7,11 +7,11 @@
 #include "base/json/json_writer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "url/gurl.h"
 
 namespace remoting {
 
diff --git a/remoting/host/setup/oauth_helper.cc b/remoting/host/setup/oauth_helper.cc
index 6cc119a..7746df1 100644
--- a/remoting/host/setup/oauth_helper.cc
+++ b/remoting/host/setup/oauth_helper.cc
@@ -6,8 +6,8 @@
 
 #include "base/strings/stringprintf.h"
 #include "google_apis/google_api_keys.h"
-#include "googleurl/src/url_parse.h"
 #include "net/base/escape.h"
+#include "url/url_parse.h"
 
 namespace {
 
diff --git a/remoting/host/token_validator_factory_impl.cc b/remoting/host/token_validator_factory_impl.cc
index bd0489b..3dd9245 100644
--- a/remoting/host/token_validator_factory_impl.cc
+++ b/remoting/host/token_validator_factory_impl.cc
@@ -16,12 +16,12 @@
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "crypto/random.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "remoting/base/rsa_key_pair.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/remoting/host/token_validator_factory_impl_unittest.cc b/remoting/host/token_validator_factory_impl_unittest.cc
index efff36c..fff915bf 100644
--- a/remoting/host/token_validator_factory_impl_unittest.cc
+++ b/remoting/host/token_validator_factory_impl_unittest.cc
@@ -8,13 +8,13 @@
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/base/test_rsa_key_pair.h"
 #include "remoting/host/token_validator_factory_impl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 namespace {
 
diff --git a/remoting/jingle_glue/chromium_port_allocator.cc b/remoting/jingle_glue/chromium_port_allocator.cc
index 43f4210..1ee6fe4 100644
--- a/remoting/jingle_glue/chromium_port_allocator.cc
+++ b/remoting/jingle_glue/chromium_port_allocator.cc
@@ -7,13 +7,13 @@
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "remoting/jingle_glue/chromium_socket_factory.h"
 #include "remoting/jingle_glue/network_settings.h"
+#include "url/gurl.h"
 
 namespace remoting {
 
diff --git a/remoting/protocol/third_party_client_authenticator.cc b/remoting/protocol/third_party_client_authenticator.cc
index 27d792b..ec5eb59 100644
--- a/remoting/protocol/third_party_client_authenticator.cc
+++ b/remoting/protocol/third_party_client_authenticator.cc
@@ -8,12 +8,12 @@
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/logging.h"
-#include "googleurl/src/gurl.h"
 #include "remoting/base/constants.h"
 #include "remoting/base/rsa_key_pair.h"
 #include "remoting/protocol/channel_authenticator.h"
 #include "remoting/protocol/v2_authenticator.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
+#include "url/gurl.h"
 
 namespace remoting {
 namespace protocol {
diff --git a/remoting/protocol/third_party_client_authenticator.h b/remoting/protocol/third_party_client_authenticator.h
index 696d8a67..b603d38 100644
--- a/remoting/protocol/third_party_client_authenticator.h
+++ b/remoting/protocol/third_party_client_authenticator.h
@@ -10,8 +10,8 @@
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
-#include "googleurl/src/gurl.h"
 #include "remoting/protocol/third_party_authenticator_base.h"
+#include "url/gurl.h"
 
 class GURL;
 
diff --git a/remoting/protocol/third_party_host_authenticator.h b/remoting/protocol/third_party_host_authenticator.h
index 60538b2..8bd470e 100644
--- a/remoting/protocol/third_party_host_authenticator.h
+++ b/remoting/protocol/third_party_host_authenticator.h
@@ -9,8 +9,8 @@
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
-#include "googleurl/src/gurl.h"
 #include "remoting/protocol/third_party_authenticator_base.h"
+#include "url/gurl.h"
 
 namespace remoting {
 
diff --git a/rlz/lib/financial_ping.cc b/rlz/lib/financial_ping.cc
index edf29ad..056c943 100644
--- a/rlz/lib/financial_ping.cc
+++ b/rlz/lib/financial_ping.cc
@@ -48,12 +48,12 @@ class InternetHandle {
 #include "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "url/gurl.h"
 
 #endif
 
diff --git a/sync/engine/net/server_connection_manager.cc b/sync/engine/net/server_connection_manager.cc
index 5cac362..a60e3a9 100644
--- a/sync/engine/net/server_connection_manager.cc
+++ b/sync/engine/net/server_connection_manager.cc
@@ -12,13 +12,13 @@
 
 #include "base/metrics/histogram.h"
 #include "build/build_config.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_status_code.h"
 #include "sync/engine/net/url_translator.h"
 #include "sync/engine/syncer.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/syncable/directory.h"
+#include "url/gurl.h"
 
 namespace syncer {
 
diff --git a/sync/internal_api/public/base_node.h b/sync/internal_api/public/base_node.h
index 51cc30c..4f285dc 100644
--- a/sync/internal_api/public/base_node.h
+++ b/sync/internal_api/public/base_node.h
@@ -12,10 +12,10 @@
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
-#include "googleurl/src/gurl.h"
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/protocol/sync.pb.h"
+#include "url/gurl.h"
 
 // Forward declarations of internal class types so that sync API objects
 // may have opaque pointers to these types.
diff --git a/sync/internal_api/public/http_bridge.h b/sync/internal_api/public/http_bridge.h
index 7830190..c3a661e 100644
--- a/sync/internal_api/public/http_bridge.h
+++ b/sync/internal_api/public/http_bridge.h
@@ -14,7 +14,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
-#include "googleurl/src/gurl.h"
 #include "net/base/network_time_notifier.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_context.h"
@@ -22,6 +21,7 @@
 #include "sync/base/sync_export.h"
 #include "sync/internal_api/public/http_post_provider_factory.h"
 #include "sync/internal_api/public/http_post_provider_interface.h"
+#include "url/gurl.h"
 
 class HttpBridgeTest;
 
diff --git a/sync/test/accounts_client/test_accounts_client.h b/sync/test/accounts_client/test_accounts_client.h
index 5c98642..e88e011 100644
--- a/sync/test/accounts_client/test_accounts_client.h
+++ b/sync/test/accounts_client/test_accounts_client.h
@@ -9,7 +9,7 @@
 #include <vector>
 
 #include "base/message_loop.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 using std::string;
 using std::vector;
diff --git a/sync/test/accounts_client/test_accounts_client_unittest.cc b/sync/test/accounts_client/test_accounts_client_unittest.cc
index c478cd4..f96fea2 100644
--- a/sync/test/accounts_client/test_accounts_client_unittest.cc
+++ b/sync/test/accounts_client/test_accounts_client_unittest.cc
@@ -6,11 +6,11 @@
 
 #include "base/json/json_writer.h"
 #include "base/values.h"
-#include "googleurl/src/gurl.h"
 #include "sync/test/accounts_client/test_accounts_client.cc"
 #include "sync/test/accounts_client/test_accounts_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "url/gurl.h"
 
 using std::string;
 using std::vector;
diff --git a/third_party/mozilla/NSString+Utils.mm b/third_party/mozilla/NSString+Utils.mm
index bc6b342..649f595 100644
--- a/third_party/mozilla/NSString+Utils.mm
+++ b/third_party/mozilla/NSString+Utils.mm
@@ -39,7 +39,7 @@
 #import <AppKit/AppKit.h>		// for NSStringDrawing.h
 
 #import "NSString+Utils.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 
 
 @implementation NSString (ChimeraStringUtils)
diff --git a/ui/base/dragdrop/os_exchange_data_unittest.cc b/ui/base/dragdrop/os_exchange_data_unittest.cc
index d6ea42e..4d5bc56 100644
--- a/ui/base/dragdrop/os_exchange_data_unittest.cc
+++ b/ui/base/dragdrop/os_exchange_data_unittest.cc
@@ -5,10 +5,10 @@
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
+#include "url/gurl.h"
 
 namespace ui {
 
diff --git a/win8/metro_driver/secondary_tile.cc b/win8/metro_driver/secondary_tile.cc
index dde56f7..97ff63d1 100644
--- a/win8/metro_driver/secondary_tile.cc
+++ b/win8/metro_driver/secondary_tile.cc
@@ -10,7 +10,7 @@
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
-#include "googleurl/src/gurl.h"
+#include "url/gurl.h"
 #include "win8/metro_driver/chrome_app_view.h"
 #include "win8/metro_driver/winrt_utils.h"