summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
Diffstat (limited to 'sync')
-rw-r--r--sync/engine/net/server_connection_manager.cc2
-rw-r--r--sync/internal_api/public/base_node.h2
-rw-r--r--sync/internal_api/public/http_bridge.h2
-rw-r--r--sync/test/accounts_client/test_accounts_client.h2
-rw-r--r--sync/test/accounts_client/test_accounts_client_unittest.cc2
5 files changed, 5 insertions, 5 deletions
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;