9 files changed, 21 insertions, 21 deletions
diff --git a/remoting/host/url_request_context.cc b/remoting/base/url_request_context.cc
index aec661f..98c7f37 100644
--- a/remoting/host/url_request_context.cc
+++ b/remoting/base/url_request_context.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/url_request_context.h"
+#include "remoting/base/url_request_context.h"
 
 #include "base/message_loop/message_loop_proxy.h"
 #include "net/cert/cert_verifier.h"
@@ -15,7 +15,7 @@
 #include "net/proxy/proxy_config_service.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
-#include "remoting/host/vlog_net_log.h"
+#include "remoting/base/vlog_net_log.h"
 
 #if defined(OS_WIN)
 #include "net/proxy/proxy_config_service_win.h"
diff --git a/remoting/host/url_request_context.h b/remoting/base/url_request_context.h
index 5260247..7399241 100644
--- a/remoting/host/url_request_context.h
+++ b/remoting/base/url_request_context.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_URL_REQUEST_CONTEXT_H_
-#define REMOTING_HOST_URL_REQUEST_CONTEXT_H_
+#ifndef REMOTING_BASE_URL_REQUEST_CONTEXT_H_
+#define REMOTING_BASE_URL_REQUEST_CONTEXT_H_
 
 #include <string>
 
@@ -61,4 +61,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_URL_REQUEST_CONTEXT_H_
+#endif  // REMOTING_BASE_URL_REQUEST_CONTEXT_H_
diff --git a/remoting/host/vlog_net_log.cc b/remoting/base/vlog_net_log.cc
index 583c075..ff2e3e3 100644
--- a/remoting/host/vlog_net_log.cc
+++ b/remoting/base/vlog_net_log.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/host/vlog_net_log.h"
+#include "remoting/base/vlog_net_log.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
diff --git a/remoting/host/vlog_net_log.h b/remoting/base/vlog_net_log.h
index 393ab1c..9bbd384 100644
--- a/remoting/host/vlog_net_log.h
+++ b/remoting/base/vlog_net_log.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_HOST_VLOG_NET_LOG_H_
-#define REMOTING_HOST_VLOG_NET_LOG_H_
+#ifndef REMOTING_BASE_VLOG_NET_LOG_H_
+#define REMOTING_BASE_VLOG_NET_LOG_H_
 
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
@@ -29,4 +29,4 @@ class VlogNetLog : public net::NetLog {
 
 }  // namespace remoting
 
-#endif  // REMOTING_HOST_VLOG_NET_LOG_H_
+#endif  // REMOTING_BASE_VLOG_NET_LOG_H_
diff --git a/remoting/host/chromoting_host_context.cc b/remoting/host/chromoting_host_context.cc
index 0d51f85..aa3146c 100644
--- a/remoting/host/chromoting_host_context.cc
+++ b/remoting/host/chromoting_host_context.cc
@@ -8,7 +8,7 @@
 
 #include "base/bind.h"
 #include "remoting/base/auto_thread.h"
-#include "remoting/host/url_request_context.h"
+#include "remoting/base/url_request_context.h"
 
 namespace remoting {
 
diff --git a/remoting/host/setup/host_starter.h b/remoting/host/setup/host_starter.h
index 1d3b97f..606ef4b 100644
--- a/remoting/host/setup/host_starter.h
+++ b/remoting/host/setup/host_starter.h
@@ -10,9 +10,9 @@
 #include "base/callback.h"
 #include "google_apis/gaia/gaia_oauth_client.h"
 #include "remoting/base/rsa_key_pair.h"
+#include "remoting/base/url_request_context.h"
 #include "remoting/host/service_client.h"
 #include "remoting/host/setup/daemon_controller.h"
-#include "remoting/host/url_request_context.h"
 
 namespace remoting {
 
diff --git a/remoting/host/setup/start_host.cc b/remoting/host/setup/start_host.cc
index fc2390d..ac50a76 100644
--- a/remoting/host/setup/start_host.cc
+++ b/remoting/host/setup/start_host.cc
@@ -12,11 +12,11 @@
 #include "base/threading/thread.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "remoting/base/url_request_context.h"
 #include "remoting/host/service_urls.h"
 #include "remoting/host/setup/host_starter.h"
 #include "remoting/host/setup/oauth_helper.h"
 #include "remoting/host/setup/pin_validator.h"
-#include "remoting/host/url_request_context.h"
 
 // A simple command-line app that registers and starts a host.
 
diff --git a/remoting/host/setup/win/host_configurer.cc b/remoting/host/setup/win/host_configurer.cc
index c0d7d19..bf5b8a6 100644
--- a/remoting/host/setup/win/host_configurer.cc
+++ b/remoting/host/setup/win/host_configurer.cc
@@ -10,8 +10,8 @@
 #include "base/command_line.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
+#include "remoting/base/url_request_context.h"
 #include "remoting/host/setup/win/host_configurer_window.h"
-#include "remoting/host/url_request_context.h"
 
 class HostConfigurerModule
     : public ATL::CAtlExeModuleT<HostConfigurerModule> {
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index eb87228..94bb83d 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -452,15 +452,11 @@
             'host/token_validator_factory_impl.h',
             'host/ui_strings.cc',
             'host/ui_strings.h',
-            'host/url_request_context.cc',
-            'host/url_request_context.h',
             'host/usage_stats_consent.h',
             'host/usage_stats_consent_mac.cc',
             'host/usage_stats_consent_win.cc',
             'host/video_scheduler.cc',
             'host/video_scheduler.h',
-            'host/vlog_net_log.cc',
-            'host/vlog_net_log.h',
             'host/win/com_security.cc',
             'host/win/com_security.h',
             'host/win/launch_process_with_token.cc',
@@ -2334,8 +2330,12 @@
         'base/socket_reader.cc',
         'base/socket_reader.h',
         'base/typed_buffer.h',
+        'base/url_request_context.cc',
+        'base/url_request_context.h',
         'base/util.cc',
         'base/util.h',
+        'base/vlog_net_log.cc',
+        'base/vlog_net_log.h',
         'codec/audio_decoder.cc',
         'codec/audio_decoder.h',
         'codec/audio_decoder_opus.cc',