Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

Commit

Permalink
Fixes for include-what-you-use compliance
Browse files Browse the repository at this point in the history
  • Loading branch information
@jmarantz
jmarantz committed Feb 3, 2016
1 parent 8bd899f commit 5ac28b3
Show file tree
Hide file tree
Showing 133 changed files with 209 additions and 178 deletions.
7 changes: 3 additions & 4 deletions pagespeed/automatic/cache_html_flow_test.cc
View file
Expand Up @@ -22,6 +22,7 @@
#include "pagespeed/automatic/proxy_interface_test_base.h"

#include "base/logging.h"
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/log_record.h"
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/http/public/mock_callback.h"
Expand All @@ -47,6 +48,7 @@
#include "pagespeed/automatic/cache_html_flow.h"
#include "pagespeed/automatic/proxy_fetch.h"
#include "pagespeed/automatic/proxy_interface.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/dynamic_annotations.h"
#include "pagespeed/kernel/base/gtest.h"
Expand All @@ -56,6 +58,7 @@
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/thread_system.h"
Expand All @@ -79,10 +82,6 @@

namespace net_instaweb {

class AbstractMutex;
class AsyncFetch;
class Statistics;

namespace {

const char kTestUrl[] = "http://test.com/text.html";
Expand Down
3 changes: 1 addition & 2 deletions pagespeed/automatic/flush_early_flow_test.cc
View file
Expand Up @@ -25,7 +25,6 @@
#include "net/instaweb/http/public/logging_proto_impl.h"
#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/request_timing_info.h"
#include "net/instaweb/public/global_constants.h"
#include "net/instaweb/rewriter/public/beacon_critical_line_info_finder.h"
#include "net/instaweb/rewriter/public/critical_css_filter.h"
Expand All @@ -42,12 +41,12 @@
#include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/test_url_namer.h"
#include "net/instaweb/rewriter/static_asset_config.pb.h"
#include "net/instaweb/util/public/mock_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/automatic/proxy_interface_test_base.h"
#include "pagespeed/kernel/base/gtest.h"
#include "pagespeed/kernel/base/mock_timer.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
Expand Down
6 changes: 3 additions & 3 deletions pagespeed/automatic/proxy_fetch.h
View file
Expand Up @@ -32,27 +32,27 @@
#include "net/instaweb/util/public/fallback_property_page.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/automatic/html_detector.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/gtest_prod.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/http/http_names.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/http/user_agent_matcher.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"

namespace net_instaweb {

class AbstractMutex;
class CacheUrlAsyncFetcher;
class Function;
class GoogleUrl;
class MessageHandler;
class ProxyFetch;
class ProxyFetchPropertyCallbackCollector;
class QueuedAlarm;
class ServerContext;
class ResponseHeaders;
class RewriteDriver;
class RewriteOptions;
class Timer;
Expand Down
4 changes: 4 additions & 0 deletions pagespeed/automatic/proxy_interface_test.cc
View file
Expand Up @@ -45,9 +45,11 @@
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/gtest.h"
#include "pagespeed/kernel/html/html_element.h"
#include "pagespeed/kernel/base/mock_message_handler.h"
#include "pagespeed/kernel/base/mock_timer.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/ref_counted_ptr.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
Expand All @@ -56,6 +58,8 @@
#include "pagespeed/kernel/base/time_util.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/cache/lru_cache.h"
#include "pagespeed/kernel/html/empty_html_filter.h"
#include "pagespeed/kernel/html/html_filter.h"
#include "pagespeed/kernel/html/html_parse_test_base.h"
#include "pagespeed/kernel/http/content_type.h"
#include "pagespeed/kernel/http/google_url.h"
Expand Down
5 changes: 2 additions & 3 deletions pagespeed/automatic/proxy_interface_test_base.cc
View file
Expand Up @@ -20,18 +20,16 @@

#include <cstddef>

#include "base/logging.h"
#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/log_record.h"
#include "net/instaweb/http/public/mock_callback.h"
#include "net/instaweb/http/public/mock_url_fetcher.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/rewriter/public/mock_critical_images_finder.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/util/public/cache_property_store.h"
#include "net/instaweb/util/public/property_cache.h"
#include "pagespeed/automatic/proxy_fetch.h"
#include "pagespeed/automatic/proxy_interface.h"
#include "pagespeed/kernel/base/basictypes.h"
Expand All @@ -53,6 +51,7 @@
#include "pagespeed/kernel/thread/queued_worker_pool.h"
#include "pagespeed/kernel/thread/thread_synchronizer.h"
#include "pagespeed/kernel/thread/worker_test_base.h"
#include "pagespeed/opt/logging/request_timing_info.h"

namespace net_instaweb {

Expand Down
16 changes: 8 additions & 8 deletions pagespeed/automatic/proxy_interface_test_base.h
View file
Expand Up @@ -21,30 +21,30 @@

#include "net/instaweb/http/public/async_fetch.h"
#include "net/instaweb/http/public/url_async_fetcher.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_test_base.h"
#include "net/instaweb/rewriter/public/test_rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/url_namer.h"
#include "pagespeed/automatic/proxy_interface.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/html/empty_html_filter.h"
#include "pagespeed/kernel/html/html_element.h"
#include "pagespeed/kernel/html/html_filter.h"
#include "pagespeed/kernel/http/google_url.h"
#include "pagespeed/kernel/http/request_headers.h"
#include "pagespeed/kernel/http/response_headers.h"
#include "pagespeed/kernel/thread/worker_test_base.h"
#include "pagespeed/opt/http/property_cache.h"
#include "pagespeed/opt/http/request_context.h"

namespace net_instaweb {

class MockCriticalImagesFinder;
class GoogleUrl;
class HtmlElement;
class HtmlFilter;
class MessageHandler;
class PropertyValue;
class RequestHeaders;
class RewriteDriver;
class RewriteOptions;

const char kPageUrl[] = "page.html";
const char kBackgroundFetchHeader[] = "X-Background-Fetch";
Expand Down
14 changes: 6 additions & 8 deletions pagespeed/automatic/static_rewriter.cc
View file
Expand Up @@ -23,13 +23,19 @@

#include "net/instaweb/http/public/http_cache.h"
#include "net/instaweb/http/public/request_context.h"
#include "net/instaweb/http/public/url_async_fetcher.h"
#include "net/instaweb/http/public/wget_url_fetcher.h"
#include "net/instaweb/rewriter/public/rewrite_driver.h"
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/rewrite_gflags.h"
#include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/server_context.h"
#include "pagespeed/kernel/base/cache_interface.h"
#include "pagespeed/kernel/base/file_system.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/hasher.h"
#include "pagespeed/kernel/base/md5_hasher.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/null_message_handler.h"
#include "pagespeed/kernel/base/stdio_file_system.h"
#include "pagespeed/kernel/base/string.h"
Expand All @@ -43,15 +49,7 @@

namespace net_instaweb {

class CacheInterface;
class FileSystem;
class Hasher;
class MessageHandler;
class ProcessContext;
class RewriteOptions;
class Statistics;
class UrlAsyncFetcher;
class Writer;

namespace {

Expand Down
4 changes: 2 additions & 2 deletions pagespeed/automatic/static_rewriter.h
View file
Expand Up @@ -22,7 +22,9 @@
#include "net/instaweb/rewriter/public/rewrite_driver_factory.h"
#include "net/instaweb/rewriter/public/rewrite_gflags.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/writer.h"
#include "pagespeed/kernel/util/simple_stats.h"

namespace net_instaweb {
Expand All @@ -32,9 +34,7 @@ class Hasher;
class MessageHandler;
class ProcessContext;
class ServerContext;
class Statistics;
class UrlAsyncFetcher;
class Writer;

// Implements a baseline RewriteDriverFactory with the simplest possible
// options for cache, fetchers, & system interface.
Expand Down
2 changes: 0 additions & 2 deletions pagespeed/controller/central_controller_interface_adapter.h
View file
Expand Up @@ -18,12 +18,10 @@
#define PAGESPEED_CONTROLLER_CENTRAL_CONTROLLER_INTERFACE_ADAPTER_H_

#include "pagespeed/controller/central_controller_interface.h"
#include "pagespeed/controller/central_controller_callback.h"
#include "pagespeed/controller/expensive_operation_callback.h"
#include "pagespeed/controller/schedule_rewrite_callback.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"

namespace net_instaweb {

Expand Down
2 changes: 2 additions & 0 deletions pagespeed/controller/expensive_operation_callback.cc
View file
Expand Up @@ -16,6 +16,8 @@

#include "pagespeed/controller/expensive_operation_callback.h"

#include "pagespeed/kernel/base/basictypes.h"

namespace net_instaweb {

ExpensiveOperationContext::ExpensiveOperationContext(
Expand Down
1 change: 0 additions & 1 deletion pagespeed/controller/expensive_operation_callback.h
View file
Expand Up @@ -19,7 +19,6 @@

#include "pagespeed/controller/central_controller_interface.h"
#include "pagespeed/controller/central_controller_callback.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/thread/sequence.h"

Expand Down
4 changes: 4 additions & 0 deletions pagespeed/controller/named_lock_schedule_rewrite_controller.cc
View file
Expand Up @@ -15,6 +15,10 @@
// Author: cheesy@google.com (Steve Hill)

#include "pagespeed/controller/named_lock_schedule_rewrite_controller.h"

#include <cstddef>

#include "base/logging.h"
#include "pagespeed/kernel/base/stl_util.h"

namespace net_instaweb {
Expand Down
2 changes: 2 additions & 0 deletions pagespeed/controller/named_lock_schedule_rewrite_controller.h
View file
Expand Up @@ -17,6 +17,7 @@
#ifndef PAGESPEED_CONTROLLER_NAMED_LOCK_SCHEDULE_REWRITE_CONTROLLER_H_
#define PAGESPEED_CONTROLLER_NAMED_LOCK_SCHEDULE_REWRITE_CONTROLLER_H_

#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/controller/schedule_rewrite_controller.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
Expand All @@ -26,6 +27,7 @@
#include "pagespeed/kernel/base/string_hash.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/named_lock_manager.h"
#include "pagespeed/kernel/base/thread_annotations.h"
#include "pagespeed/kernel/base/thread_system.h"

namespace net_instaweb {
Expand Down
4 changes: 2 additions & 2 deletions pagespeed/controller/popularity_contest_schedule_rewrite_controller.cc
View file
Expand Up @@ -17,10 +17,10 @@
#include "pagespeed/controller/popularity_contest_schedule_rewrite_controller.h"

#include <unordered_map>
#include <utility>

#include "base/logging.h"
#include "pagespeed/controller/priority_queue.h"
#include "pagespeed/controller/schedule_rewrite_controller.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
Expand Down
3 changes: 3 additions & 0 deletions pagespeed/controller/popularity_contest_schedule_rewrite_controller.h
View file
Expand Up @@ -17,16 +17,19 @@
#ifndef PAGESPEED_CONTROLLER_POPULARITY_CONTEST_SCHEDULE_REWRITE_CONTROLLER_H_
#define PAGESPEED_CONTROLLER_POPULARITY_CONTEST_SCHEDULE_REWRITE_CONTROLLER_H_

#include <cstddef>
#include <unordered_map>

#include "pagespeed/controller/priority_queue.h"
#include "pagespeed/controller/schedule_rewrite_controller.h"
#include "pagespeed/kernel/base/abstract_mutex.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/statistics.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/timer.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/thread_annotations.h"
#include "pagespeed/kernel/base/thread_system.h"

// Implementation of ScheduleRewriteController that uses priority queue to
Expand Down
1 change: 1 addition & 0 deletions pagespeed/controller/popularity_contest_schedule_rewrite_controller_test.cc
View file
Expand Up @@ -21,6 +21,7 @@
#include <algorithm>
#include <queue>

#include "base/logging.h"
#include "pagespeed/kernel/base/function.h"
#include "pagespeed/kernel/base/gmock.h"
#include "pagespeed/kernel/base/gtest.h"
Expand Down
3 changes: 2 additions & 1 deletion pagespeed/controller/priority_queue.h
View file
Expand Up @@ -17,14 +17,15 @@
#ifndef PAGESPEED_CONTROLLER_PRIORITY_QUEUE_H_
#define PAGESPEED_CONTROLLER_PRIORITY_QUEUE_H_

#include <algorithm>
#include <cstddef>
#include <functional>
#include <utility>
#include <unordered_map>
#include <vector>

#include "base/logging.h"
#include "base/macros.h"
#include "pagespeed/kernel/base/basictypes.h"

// Priority queue that supports incrementing the priority of a key.

Expand Down
1 change: 0 additions & 1 deletion pagespeed/controller/priority_queue_test.cc
View file
Expand Up @@ -15,7 +15,6 @@
// Author: cheesy@google.com (Steve Hill)

#include "pagespeed/controller/priority_queue.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/gmock.h"
#include "pagespeed/kernel/base/gtest.h"
#include "pagespeed/kernel/base/string.h"
Expand Down
3 changes: 1 addition & 2 deletions pagespeed/controller/schedule_rewrite_callback.h
View file
Expand Up @@ -19,10 +19,9 @@

#include "pagespeed/controller/central_controller_interface.h"
#include "pagespeed/controller/central_controller_callback.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/thread/queued_worker_pool.h"
#include "pagespeed/kernel/thread/sequence.h"

// Callback classes to support rewrite scheduling in
// CentralControllerInterfaceAdapter.
Expand Down
2 changes: 1 addition & 1 deletion pagespeed/kernel/base/chunking_writer_test.cc
View file
Expand Up @@ -19,6 +19,7 @@
#include "pagespeed/kernel/base/chunking_writer.h"

#include "pagespeed/kernel/base/gtest.h"
#include "pagespeed/kernel/base/message_handler.h"
#include "pagespeed/kernel/base/mock_message_handler.h"
#include "pagespeed/kernel/base/null_mutex.h"
#include "pagespeed/kernel/base/scoped_ptr.h"
Expand All @@ -27,7 +28,6 @@
#include "pagespeed/kernel/base/writer.h"

namespace net_instaweb {
class MessageHandler;

namespace {

Expand Down
1 change: 0 additions & 1 deletion pagespeed/kernel/base/file_system.cc
View file
Expand Up @@ -26,7 +26,6 @@
#include "pagespeed/kernel/base/stack_buffer.h"
#include "pagespeed/kernel/base/string.h"
#include "pagespeed/kernel/base/string_util.h"
#include "pagespeed/kernel/base/string_writer.h"
#include "pagespeed/kernel/base/writer.h"

namespace net_instaweb {
Expand Down
1 change: 0 additions & 1 deletion pagespeed/kernel/base/file_system_speed_test.cc
View file
Expand Up @@ -17,7 +17,6 @@
// Author: jmarantz@google.com (Joshua Marantz)

#include "base/logging.h"
#include "pagespeed/kernel/base/basictypes.h"
#include "pagespeed/kernel/base/benchmark.h"
#include "pagespeed/kernel/base/google_message_handler.h"
#include "pagespeed/kernel/base/gtest.h"
Expand Down

0 comments on commit 5ac28b3

Please sign in to comment.