Merge pull request #935 from pagespeed/jefftk-system-public

system/public/ was moved to system/, update our references.

src/ngx_message_handler.h

@@ -28,7 +28,7 @@ extern "C" {
 #include "pagespeed/kernel/base/message_handler.h"
 #include "pagespeed/kernel/base/string.h"
 #include "pagespeed/kernel/base/string_util.h"
-#include "pagespeed/system/public/system_message_handler.h"
+#include "pagespeed/system/system_message_handler.h"
 
 namespace net_instaweb {
 

src/ngx_pagespeed.cc

@@ -68,12 +68,12 @@
 #include "pagespeed/kernel/thread/pthread_shared_mem.h"
 #include "pagespeed/kernel/util/gzip_inflater.h"
 #include "pagespeed/kernel/util/statistics_logger.h"
-#include "pagespeed/system/public/in_place_resource_recorder.h"
-#include "pagespeed/system/public/system_caches.h"
-#include "pagespeed/system/public/system_request_context.h"
-#include "pagespeed/system/public/system_rewrite_options.h"
-#include "pagespeed/system/public/system_server_context.h"
-#include "pagespeed/system/public/system_thread_system.h"
+#include "pagespeed/system/in_place_resource_recorder.h"
+#include "pagespeed/system/system_caches.h"
+#include "pagespeed/system/system_request_context.h"
+#include "pagespeed/system/system_rewrite_options.h"
+#include "pagespeed/system/system_server_context.h"
+#include "pagespeed/system/system_thread_system.h"
 
 extern ngx_module_t ngx_pagespeed;
 

src/ngx_rewrite_driver_factory.cc

@@ -46,10 +46,10 @@
 #include "pagespeed/kernel/thread/pthread_shared_mem.h"
 #include "pagespeed/kernel/thread/scheduler_thread.h"
 #include "pagespeed/kernel/thread/slow_worker.h"
-#include "pagespeed/system/public/in_place_resource_recorder.h"
-#include "pagespeed/system/public/serf_url_async_fetcher.h"
-#include "pagespeed/system/public/system_caches.h"
-#include "pagespeed/system/public/system_rewrite_options.h"
+#include "pagespeed/system/in_place_resource_recorder.h"
+#include "pagespeed/system/serf_url_async_fetcher.h"
+#include "pagespeed/system/system_caches.h"
+#include "pagespeed/system/system_rewrite_options.h"
 
 namespace net_instaweb {
 

src/ngx_rewrite_driver_factory.h

@@ -30,7 +30,7 @@ extern "C" {
 
 #include "pagespeed/kernel/base/md5_hasher.h"
 #include "pagespeed/kernel/base/scoped_ptr.h"
-#include "pagespeed/system/public/system_rewrite_driver_factory.h"
+#include "pagespeed/system/system_rewrite_driver_factory.h"
 
 namespace net_instaweb {
 

src/ngx_rewrite_options.cc

@@ -32,7 +32,7 @@ extern "C" {
 #include "net/instaweb/rewriter/public/rewrite_options.h"
 #include "pagespeed/kernel/base/message_handler.h"
 #include "pagespeed/kernel/base/timer.h"
-#include "pagespeed/system/public/system_caches.h"
+#include "pagespeed/system/system_caches.h"
 
 namespace net_instaweb {
 

src/ngx_rewrite_options.h

@@ -33,7 +33,7 @@ extern "C" {
 #include "pagespeed/kernel/base/message_handler.h"
 #include "pagespeed/kernel/base/ref_counted_ptr.h"
 #include "pagespeed/kernel/base/stl_util.h"          // for STLDeleteElements
-#include "pagespeed/system/public/system_rewrite_options.h"
+#include "pagespeed/system/system_rewrite_options.h"
 
 #define NGX_PAGESPEED_MAX_ARGS 10
 

src/ngx_server_context.cc

@@ -27,9 +27,9 @@ extern "C" {
 #include "ngx_rewrite_driver_factory.h"
 #include "ngx_rewrite_options.h"
 #include "net/instaweb/rewriter/public/rewrite_driver.h"
-#include "pagespeed/system/public/add_headers_fetcher.h"
-#include "pagespeed/system/public/loopback_route_fetcher.h"
-#include "pagespeed/system/public/system_request_context.h"
+#include "pagespeed/system/add_headers_fetcher.h"
+#include "pagespeed/system/loopback_route_fetcher.h"
+#include "pagespeed/system/system_request_context.h"
 
 namespace net_instaweb {
 

src/ngx_server_context.h

@@ -22,7 +22,7 @@
 #define NGX_SERVER_CONTEXT_H_
 
 #include "ngx_message_handler.h"
-#include "pagespeed/system/public/system_server_context.h"
+#include "pagespeed/system/system_server_context.h"
 
 extern "C" {
 #include <ngx_http.h>