Change references from net/instaweb/automatic to pagespeed/automatic.

config

@@ -105,7 +105,7 @@ psol_binary="${PSOL_BINARY:-unset}"
 if [ "$psol_binary" = "unset" ] ; then
   if $build_from_source ; then
     psol_binary="\
-        $mod_pagespeed_dir/net/instaweb/automatic/pagespeed_automatic.a"
+        $mod_pagespeed_dir/pagespeed/automatic/pagespeed_automatic.a"
   else
     psol_library_dir="$ngx_addon_dir/psol/lib/$buildtype/$os_name/$arch_name"
     psol_binary="$psol_library_dir/pagespeed_automatic.a"

src/ngx_pagespeed.cc

@@ -37,7 +37,6 @@
 #include "ngx_rewrite_options.h"
 #include "ngx_server_context.h"
 
-#include "net/instaweb/automatic/public/proxy_fetch.h"
 #include "net/instaweb/http/public/async_fetch.h"
 #include "net/instaweb/http/public/cache_url_async_fetcher.h"
 #include "net/instaweb/http/public/request_context.h"
@@ -53,6 +52,7 @@
 #include "net/instaweb/rewriter/public/rewrite_stats.h"
 #include "net/instaweb/rewriter/public/static_asset_manager.h"
 #include "net/instaweb/util/public/fallback_property_page.h"
+#include "pagespeed/automatic/public/proxy_fetch.h"
 #include "pagespeed/kernel/base/google_message_handler.h"
 #include "pagespeed/kernel/base/null_message_handler.h"
 #include "pagespeed/kernel/base/posix_timer.h"

test/nginx_system_test.sh

@@ -289,7 +289,6 @@ SERVER_NAME=nginx
 
 # run generic system tests
 SYSTEM_TEST_FILE="$MOD_PAGESPEED_DIR/src/pagespeed/system/system_test.sh"
-AUTOMATIC_SYSTEM_TEST="$MOD_PAGESPEED_DIR/src/net/instaweb/automatic/system_test.sh"
 
 if [ ! -e "$SYSTEM_TEST_FILE" ] ; then
   echo "Not finding $SYSTEM_TEST_FILE -- is mod_pagespeed not in a parallel"