Skip to content

Commit

Permalink
Cleanup: IWYU for base/gtest_prod_util.h.
Browse files Browse the repository at this point in the history
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

TBR=pneubeck@chromium.org

Review URL: https://codereview.chromium.org/1366123002

Cr-Commit-Position: refs/heads/master@{#350770}
  • Loading branch information
leizleiz authored and Commit bot committed Sep 25, 2015
1 parent 787d405 commit a0e18cd
Show file tree
Hide file tree
Showing 227 changed files with 166 additions and 188 deletions.
7 changes: 3 additions & 4 deletions ash/display/unified_mouse_warp_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H
#define ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H
#ifndef ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_
#define ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_

#include "ash/display/mouse_warp_controller.h"

#include "base/gtest_prod_util.h"
#include "ui/gfx/geometry/rect.h"

namespace aura {
Expand Down Expand Up @@ -62,4 +61,4 @@ class ASH_EXPORT UnifiedMouseWarpController : public MouseWarpController {

} // namespace ash

#endif // ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H
#endif // ASH_DISPLAY_UNIFIED_MOUSE_WARP_CONTROLLER_H_
2 changes: 1 addition & 1 deletion ash/shelf/shelf_layout_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "ash/wm/workspace/workspace_types.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/logging.h"
#include "base/observer_list.h"
#include "base/timer/timer.h"
Expand Down Expand Up @@ -65,7 +66,6 @@ class ASH_EXPORT ShelfLayoutManager
public SnapToPixelLayoutManager,
public SessionStateObserver {
public:

// We reserve a small area on the edge of the workspace area to ensure that
// the resize handle at the edge of the window can be hit.
static const int kWorkspaceAreaVisibleInset;
Expand Down
1 change: 0 additions & 1 deletion ash/system/tray_accessibility.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "ash/system/tray/tray_image_item.h"
#include "ash/system/tray/tray_notification_view.h"
#include "ash/system/tray/view_click_listener.h"
#include "base/gtest_prod_util.h"
#include "ui/gfx/font.h"
#include "ui/views/controls/button/button.h"

Expand Down
1 change: 1 addition & 0 deletions ash/touch/touch_transformer_controller.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include "ash/ash_export.h"
#include "ash/display/window_tree_host_manager.h"
#include "base/gtest_prod_util.h"
#include "ui/gfx/transform.h"

namespace ui {
Expand Down
1 change: 0 additions & 1 deletion ash/wm/dock/docked_window_layout_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "ash/wm/window_state_observer.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/time/time.h"
Expand Down
16 changes: 8 additions & 8 deletions ash/wm/workspace/workspace_window_resizer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ class WindowSize {
max_ = size_;
}

bool is_at_capacity(bool shrinking) {
bool is_at_capacity(bool shrinking) const {
return size_ == (shrinking ? min_ : max_);
}

Expand Down Expand Up @@ -630,7 +630,7 @@ int WorkspaceWindowResizer::CalculateAttachedSizes(

int leftover_pixels = 0;
while (grow_attached_by != 0) {
int leftovers = GrowFairly(grow_attached_by, window_sizes);
int leftovers = GrowFairly(grow_attached_by, &window_sizes);
if (leftovers == grow_attached_by) {
leftover_pixels = leftovers;
break;
Expand All @@ -644,14 +644,14 @@ int WorkspaceWindowResizer::CalculateAttachedSizes(
return leftover_pixels;
}

int WorkspaceWindowResizer::GrowFairly(
int pixels,
std::vector<WindowSize>& sizes) const {
int WorkspaceWindowResizer::GrowFairly(int pixels,
std::vector<WindowSize>* sizes) const {
bool shrinking = pixels < 0;
std::vector<WindowSize*> nonfull_windows;
for (size_t i = 0; i < sizes.size(); ++i) {
if (!sizes[i].is_at_capacity(shrinking))
nonfull_windows.push_back(&sizes[i]);
for (size_t i = 0; i < sizes->size(); ++i) {
WindowSize& current_window_size = (*sizes)[i];
if (!current_window_size.is_at_capacity(shrinking))
nonfull_windows.push_back(&current_window_size);
}
std::vector<float> ratios;
CalculateGrowthRatios(nonfull_windows, &ratios);
Expand Down
9 changes: 4 additions & 5 deletions ash/wm/workspace/workspace_window_resizer.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#ifndef ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
#define ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
#ifndef ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
#define ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_

#include <vector>

#include "ash/wm/window_resizer.h"
#include "ash/wm/workspace/magnetism_matcher.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "ui/aura/window_tracker.h"
Expand Down Expand Up @@ -91,7 +90,7 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {
// Divides |amount| evenly between |sizes|. If |amount| is negative it
// indicates how many pixels |sizes| should be shrunk by.
// Returns how many pixels failed to be allocated/removed from |sizes|.
int GrowFairly(int amount, std::vector<WindowSize>& sizes) const;
int GrowFairly(int amount, std::vector<WindowSize>* sizes) const;

// Calculate the ratio of pixels that each WindowSize in |sizes| should
// receive when growing or shrinking.
Expand Down Expand Up @@ -223,4 +222,4 @@ class ASH_EXPORT WorkspaceWindowResizer : public WindowResizer {

} // namespace ash

#endif // ASH_WM_WORKSPACE_WINDOW_RESIZER_H_
#endif // ASH_WM_WORKSPACE_WORKSPACE_WINDOW_RESIZER_H_
1 change: 0 additions & 1 deletion base/memory/memory_pressure_monitor_chromeos.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "base/base_export.h"
#include "base/files/scoped_file.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/memory_pressure_listener.h"
#include "base/memory/memory_pressure_monitor.h"
Expand Down
1 change: 0 additions & 1 deletion base/metrics/bucket_ranges.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@

#include "base/base_export.h"
#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/metrics/histogram_base.h"

namespace base {
Expand Down
3 changes: 1 addition & 2 deletions base/trace_event/trace_event_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "base/base_export.h"
#include "base/callback.h"
#include "base/containers/hash_tables.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted_memory.h"
#include "base/observer_list.h"
#include "base/single_thread_task_runner.h"
Expand Down Expand Up @@ -111,7 +110,7 @@ class BASE_EXPORT TraceEvent {

void UpdateDuration(const TraceTicks& now, const ThreadTicks& thread_now);

void EstimateTraceMemoryOverhead(TraceEventMemoryOverhead*);
void EstimateTraceMemoryOverhead(TraceEventMemoryOverhead* overhead);

// Serialize event data to JSON
void AppendAsJSON(
Expand Down
1 change: 1 addition & 0 deletions base/trace_event/trace_log.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef BASE_TRACE_EVENT_TRACE_LOG_H_
#define BASE_TRACE_EVENT_TRACE_LOG_H_

#include "base/gtest_prod_util.h"
#include "base/trace_event/memory_dump_provider.h"
#include "base/trace_event/trace_config.h"
#include "base/trace_event/trace_event_impl.h"
Expand Down
1 change: 0 additions & 1 deletion cc/scheduler/begin_frame_source_unittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#include <string>

#include "base/basictypes.h"
#include "base/gtest_prod_util.h"
#include "base/test/test_simple_task_runner.h"
#include "cc/scheduler/begin_frame_source.h"
#include "cc/test/begin_frame_args_test.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/chrome_content_browser_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include <utility>
#include <vector>

#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/chromeos/extensions/external_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#include "base/basictypes.h"
#include "base/callback_forward.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/chromeos/file_system_provider/service.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "base/files/file.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/chromeos/mobile/mobile_activator.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <string>

#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/memory/weak_ptr.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "base/basictypes.h"
#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/stl_util.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/engagement/site_engagement_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include <map>

#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/time/default_clock.h"
#include "base/time/time.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/activity_log/activity_log.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <vector>

#include "base/callback.h"
#include "base/gtest_prod_util.h"
#include "base/observer_list_threadsafe.h"
#include "base/scoped_observer.h"
#include "base/synchronization/lock.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/activity_log/counting_policy.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <string>

#include "base/containers/hash_tables.h"
#include "base/gtest_prod_util.h"
#include "chrome/browser/extensions/activity_log/activity_database.h"
#include "chrome/browser/extensions/activity_log/activity_log_policy.h"
#include "chrome/browser/extensions/activity_log/database_string_table.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

#include "base/files/file_path.h"
#include "base/files/file_path_watcher.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/singleton.h"
#include "base/observer_list.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H_
#define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H_

#include "base/gtest_prod_util.h"
#include "chrome/browser/extensions/chrome_extension_function.h"

class PluginFinder;
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/api/identity/identity_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include <utility>
#include <vector>

#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "base/observer_list.h"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <map>
#include <string>

#include "base/gtest_prod_util.h"
#include "base/memory/linked_ptr.h"
#include "base/scoped_observer.h"
#include "base/threading/thread_checker.h"
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/extensions/background_app_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.

#include "base/gtest_prod_util.h"
#include "chrome/browser/background/background_mode_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/extensions/extension_browsertest.h"
Expand Down Expand Up @@ -45,7 +46,6 @@ class BackgroundAppBrowserTest: public ExtensionBrowserTest {};
// Tests that if we reload a background app, we don't get a popup bubble
// telling us that a new background app has been installed.
IN_PROC_BROWSER_TEST_F(BackgroundAppBrowserTest, ReloadBackgroundApp) {

// Pass this in to the browser test.
scoped_ptr<BackgroundModeManager> test_background_mode_manager(
new TestBackgroundModeManager(
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/extension_sync_data.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <string>

#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/version.h"
#include "extensions/common/constants.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/extension_sync_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <string>
#include <vector>

#include "base/gtest_prod_util.h"
#include "base/scoped_observer.h"
#include "base/version.h"
#include "chrome/browser/extensions/sync_bundle.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/pending_extension_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include <list>
#include <string>

#include "base/gtest_prod_util.h"
#include "chrome/browser/extensions/pending_extension_info.h"
#include "extensions/common/manifest.h"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/time/time.h"
#include "components/keyed_service/core/keyed_service.h"
#include "components/signin/core/browser/signin_manager_base.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/extensions/updater/extension_updater.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "base/callback_forward.h"
#include "base/compiler_specific.h"
#include "base/files/file_path.h"
#include "base/gtest_prod_util.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/scoped_observer.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/webstore_installer.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <string>

#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/scoped_observer.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/extensions/webstore_startup_installer.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_EXTENSIONS_WEBSTORE_STARTUP_INSTALLER_H_
#define CHROME_BROWSER_EXTENSIONS_WEBSTORE_STARTUP_INSTALLER_H_

#include "base/gtest_prod_util.h"
#include "chrome/browser/extensions/webstore_install_with_prompt.h"

namespace extensions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/containers/hash_tables.h"
#include "base/gtest_prod_util.h"
#include "base/id_map.h"
#include "base/memory/scoped_vector.h"
#include "base/synchronization/waitable_event.h"
Expand Down Expand Up @@ -189,7 +190,7 @@ void GeolocationPermissionContextTests::RequestGeolocationPermission(
web_contents, id, requesting_frame, user_gesture,
base::Bind(&GeolocationPermissionContextTests::PermissionResponse,
base::Unretained(this), id));
content::RunAllBlockingPoolTasksUntilIdle();
content::RunAllBlockingPoolTasksUntilIdle();
}

void GeolocationPermissionContextTests::PermissionResponse(
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/image_holder.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#ifndef CHROME_BROWSER_IMAGE_HOLDER_H_
#define CHROME_BROWSER_IMAGE_HOLDER_H_

#include "base/gtest_prod_util.h"
#include "base/memory/scoped_vector.h"
#include "chrome/browser/bitmap_fetcher/bitmap_fetcher.h"
#include "ui/gfx/image/image.h"
Expand Down
1 change: 0 additions & 1 deletion chrome/browser/media/router/media_route.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <string>

#include "base/containers/small_map.h"
#include "base/gtest_prod_util.h"
#include "base/logging.h"
#include "base/values.h"
#include "chrome/browser/media/router/media_sink.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/media/router/media_router_mojo_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include "base/containers/hash_tables.h"
#include "base/containers/scoped_ptr_hash_map.h"
#include "base/gtest_prod_util.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/memory/tab_manager_delegate_chromeos.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <vector>

#include "base/containers/hash_tables.h"
#include "base/gtest_prod_util.h"
#include "base/process/process.h"
#include "base/timer/timer.h"
#include "chrome/browser/memory/tab_manager.h"
Expand Down
Loading

0 comments on commit a0e18cd

Please sign in to comment.