diff --git a/DEPS b/DEPS index 7cb1c46..083144e3 100644 --- a/DEPS +++ b/DEPS
@@ -39,7 +39,7 @@ # Three lines of non-changing comments so that # the commit queue can handle CLs rolling Skia # and whatever else without interference from each other. - 'skia_revision': '43a6f405e6aa0726fd18eb2b1575ac12ea093610', + 'skia_revision': '9a878a00ef2c2eb72628c807be5969e2d8098317', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling V8 # and whatever else without interference from each other.
diff --git a/apps/custom_launcher_page_contents.cc b/apps/custom_launcher_page_contents.cc index 8888993..70c9b0ff 100644 --- a/apps/custom_launcher_page_contents.cc +++ b/apps/custom_launcher_page_contents.cc
@@ -5,6 +5,7 @@ #include "apps/custom_launcher_page_contents.h" #include <string> +#include <utility> #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" @@ -22,8 +23,7 @@ CustomLauncherPageContents::CustomLauncherPageContents( scoped_ptr<extensions::AppDelegate> app_delegate, const std::string& extension_id) - : app_delegate_(app_delegate.Pass()), extension_id_(extension_id) { -} + : app_delegate_(std::move(app_delegate)), extension_id_(extension_id) {} CustomLauncherPageContents::~CustomLauncherPageContents() { }
diff --git a/apps/saved_files_service.cc b/apps/saved_files_service.cc index d166338..bfe40278 100644 --- a/apps/saved_files_service.cc +++ b/apps/saved_files_service.cc
@@ -5,9 +5,9 @@ #include "apps/saved_files_service.h" #include <stdint.h> - #include <algorithm> #include <map> +#include <utility> #include "apps/saved_files_service_factory.h" #include "base/containers/scoped_ptr_hash_map.h" @@ -423,7 +423,7 @@ const std::string& id = file_entry->id; saved_file_lru_.insert( std::make_pair(file_entry->sequence_number, file_entry.get())); - registered_file_entries_.add(id, file_entry.Pass()); + registered_file_entries_.add(id, std::move(file_entry)); } }
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc index 19d53e1..25fde9c3 100644 --- a/ash/accelerators/accelerator_controller.cc +++ b/ash/accelerators/accelerator_controller.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cmath> #include <string> +#include <utility> #include "ash/accelerators/accelerator_commands.h" #include "ash/accelerators/debug_commands.h" @@ -169,7 +170,8 @@ system_notifier::kNotifierDeprecatedAccelerator), message_center::RichNotificationData(), new DeprecatedAcceleratorNotificationDelegate)); - message_center::MessageCenter::Get()->AddNotification(notification.Pass()); + message_center::MessageCenter::Get()->AddNotification( + std::move(notification)); } void RecordUmaHistogram(const char* histogram_name, @@ -831,17 +833,17 @@ void AcceleratorController::SetBrightnessControlDelegate( scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) { - brightness_control_delegate_ = brightness_control_delegate.Pass(); + brightness_control_delegate_ = std::move(brightness_control_delegate); } void AcceleratorController::SetImeControlDelegate( scoped_ptr<ImeControlDelegate> ime_control_delegate) { - ime_control_delegate_ = ime_control_delegate.Pass(); + ime_control_delegate_ = std::move(ime_control_delegate); } void AcceleratorController::SetScreenshotDelegate( scoped_ptr<ScreenshotDelegate> screenshot_delegate) { - screenshot_delegate_ = screenshot_delegate.Pass(); + screenshot_delegate_ = std::move(screenshot_delegate); } bool AcceleratorController::ShouldCloseMenuAndRepostAccelerator( @@ -1454,7 +1456,7 @@ scoped_ptr<KeyboardBrightnessControlDelegate> keyboard_brightness_control_delegate) { keyboard_brightness_control_delegate_ = - keyboard_brightness_control_delegate.Pass(); + std::move(keyboard_brightness_control_delegate); } } // namespace ash
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc index 2d4b60d..738bf485 100644 --- a/ash/accelerators/accelerator_controller_unittest.cc +++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -1054,7 +1054,7 @@ EXPECT_FALSE(ProcessInController(hangul)); DummyImeControlDelegate* delegate = new DummyImeControlDelegate; GetController()->SetImeControlDelegate( - scoped_ptr<ImeControlDelegate>(delegate).Pass()); + scoped_ptr<ImeControlDelegate>(delegate)); EXPECT_EQ(0, delegate->handle_previous_ime_count()); EXPECT_TRUE(ProcessInController(control_space_down)); EXPECT_EQ(1, delegate->handle_previous_ime_count()); @@ -1084,7 +1084,7 @@ DummyImeControlDelegate* delegate = new DummyImeControlDelegate; GetController()->SetImeControlDelegate( - scoped_ptr<ImeControlDelegate>(delegate).Pass()); + scoped_ptr<ImeControlDelegate>(delegate)); EXPECT_EQ(0, delegate->handle_next_ime_count()); EXPECT_FALSE(ProcessInController(shift_alt_press)); EXPECT_TRUE(ProcessInController(shift_alt)); @@ -1192,7 +1192,7 @@ TEST_F(AcceleratorControllerTest, ImeGlobalAcceleratorsNoConflict) { DummyImeControlDelegate* delegate = new DummyImeControlDelegate; GetController()->SetImeControlDelegate( - scoped_ptr<ImeControlDelegate>(delegate).Pass()); + scoped_ptr<ImeControlDelegate>(delegate)); ui::test::EventGenerator& generator = GetEventGenerator(); // Correct sequence of a conflicting accelerator must not trigger next IME.
diff --git a/ash/display/mirror_window_controller.cc b/ash/display/mirror_window_controller.cc index 7daadce..df57174 100644 --- a/ash/display/mirror_window_controller.cc +++ b/ash/display/mirror_window_controller.cc
@@ -4,6 +4,8 @@ #include "ash/display/mirror_window_controller.h" +#include <utility> + #if defined(USE_X11) #include <X11/Xlib.h> #include <X11/extensions/XInput2.h> @@ -226,7 +228,7 @@ new aura::Window(nullptr); mirror_window->Init(ui::LAYER_SOLID_COLOR); host->window()->AddChild(mirror_window); - host_info->ash_host->SetRootWindowTransformer(transformer.Pass()); + host_info->ash_host->SetRootWindowTransformer(std::move(transformer)); mirror_window->SetBounds(host->window()->bounds()); mirror_window->Show(); if (reflector_) { @@ -242,7 +244,7 @@ mirroring_host_info_map_[display_info.id()]->ash_host.get(); aura::WindowTreeHost* host = ash_host->AsWindowTreeHost(); GetRootWindowSettings(host->window())->display_id = display_info.id(); - ash_host->SetRootWindowTransformer(transformer.Pass()); + ash_host->SetRootWindowTransformer(std::move(transformer)); host->SetBounds(display_info.bounds_in_native()); } }
diff --git a/ash/display/mouse_cursor_event_filter.cc b/ash/display/mouse_cursor_event_filter.cc index 570058f..2efb75a 100644 --- a/ash/display/mouse_cursor_event_filter.cc +++ b/ash/display/mouse_cursor_event_filter.cc
@@ -23,10 +23,8 @@ } void MouseCursorEventFilter::ShowSharedEdgeIndicator(aura::Window* from) { - mouse_warp_controller_ = Shell::GetInstance() - ->display_manager() - ->CreateMouseWarpController(from) - .Pass(); + mouse_warp_controller_ = + Shell::GetInstance()->display_manager()->CreateMouseWarpController(from); } void MouseCursorEventFilter::HideSharedEdgeIndicator() { @@ -38,10 +36,9 @@ } void MouseCursorEventFilter::OnDisplayConfigurationChanged() { - mouse_warp_controller_ = Shell::GetInstance() - ->display_manager() - ->CreateMouseWarpController(nullptr) - .Pass(); + mouse_warp_controller_ = + Shell::GetInstance()->display_manager()->CreateMouseWarpController( + nullptr); } void MouseCursorEventFilter::OnMouseEvent(ui::MouseEvent* event) {
diff --git a/ash/display/window_tree_host_manager.cc b/ash/display/window_tree_host_manager.cc index bb0224e..8f2ba2eb 100644 --- a/ash/display/window_tree_host_manager.cc +++ b/ash/display/window_tree_host_manager.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <cmath> #include <map> +#include <utility> #include "ash/ash_switches.h" #include "ash/display/cursor_window_controller.h" @@ -148,7 +149,7 @@ #endif scoped_ptr<RootWindowTransformer> transformer( CreateRootWindowTransformerForDisplay(host->window(), display)); - ash_host->SetRootWindowTransformer(transformer.Pass()); + ash_host->SetRootWindowTransformer(std::move(transformer)); DisplayMode mode = GetDisplayManager()->GetActiveModeForDisplayId(display.id());
diff --git a/ash/drag_drop/drag_drop_controller.cc b/ash/drag_drop/drag_drop_controller.cc index 3882ea3..ad87b7c5 100644 --- a/ash/drag_drop/drag_drop_controller.cc +++ b/ash/drag_drop/drag_drop_controller.cc
@@ -4,6 +4,8 @@ #include "ash/drag_drop/drag_drop_controller.h" +#include <utility> + #include "ash/drag_drop/drag_drop_tracker.h" #include "ash/drag_drop/drag_image_view.h" #include "ash/shell.h" @@ -565,7 +567,7 @@ drag_data_ = NULL; // Cleanup can be called again while deleting DragDropTracker, so delete // the pointer with a local variable to avoid double free. - scoped_ptr<ash::DragDropTracker> holder = drag_drop_tracker_.Pass(); + scoped_ptr<ash::DragDropTracker> holder = std::move(drag_drop_tracker_); } } // namespace ash
diff --git a/ash/frame/custom_frame_view_ash_unittest.cc b/ash/frame/custom_frame_view_ash_unittest.cc index ab3656e..3d227f3 100644 --- a/ash/frame/custom_frame_view_ash_unittest.cc +++ b/ash/frame/custom_frame_view_ash_unittest.cc
@@ -108,7 +108,7 @@ params.bounds = gfx::Rect(0, 0, 100, 100); params.context = CurrentContext(); widget->Init(params); - return widget.Pass(); + return widget; } test::TestSessionStateDelegate* GetTestSessionStateDelegate() {
diff --git a/ash/host/ash_window_tree_host_unified.cc b/ash/host/ash_window_tree_host_unified.cc index f94d1e2..ab9a954e 100644 --- a/ash/host/ash_window_tree_host_unified.cc +++ b/ash/host/ash_window_tree_host_unified.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "ash/host/ash_window_tree_host_unified.h" + +#include <utility> + #include "ash/host/root_window_transformer.h" #include "ash/ime/input_method_event_handler.h" #include "base/logging.h" @@ -91,7 +94,7 @@ void AshWindowTreeHostUnified::SetRootWindowTransformer( scoped_ptr<RootWindowTransformer> transformer) { - transformer_helper_.SetRootWindowTransformer(transformer.Pass()); + transformer_helper_.SetRootWindowTransformer(std::move(transformer)); } gfx::Insets AshWindowTreeHostUnified::GetHostInsets() const {
diff --git a/ash/host/ash_window_tree_host_x11.cc b/ash/host/ash_window_tree_host_x11.cc index 24332af..50e29a4b 100644 --- a/ash/host/ash_window_tree_host_x11.cc +++ b/ash/host/ash_window_tree_host_x11.cc
@@ -4,12 +4,12 @@ #include "ash/host/ash_window_tree_host_x11.h" -#include <X11/extensions/Xfixes.h> -#include <X11/extensions/XInput2.h> #include <X11/Xatom.h> #include <X11/Xlib.h> - +#include <X11/extensions/XInput2.h> +#include <X11/extensions/Xfixes.h> #include <string> +#include <utility> #include <vector> #include "ash/host/ash_window_tree_host_init_params.h" @@ -112,7 +112,7 @@ void AshWindowTreeHostX11::SetRootWindowTransformer( scoped_ptr<RootWindowTransformer> transformer) { - transformer_helper_.SetRootWindowTransformer(transformer.Pass()); + transformer_helper_.SetRootWindowTransformer(std::move(transformer)); if (pointer_barriers_) { UnConfineCursor(); ConfineCursorToRootWindow();
diff --git a/ash/host/transformer_helper.cc b/ash/host/transformer_helper.cc index af56d8a..aba9460 100644 --- a/ash/host/transformer_helper.cc +++ b/ash/host/transformer_helper.cc
@@ -4,6 +4,8 @@ #include "ash/host/transformer_helper.h" +#include <utility> + #include "ash/host/ash_window_tree_host.h" #include "ash/host/root_window_transformer.h" #include "ui/aura/window.h" @@ -73,12 +75,12 @@ void TransformerHelper::SetTransform(const gfx::Transform& transform) { scoped_ptr<RootWindowTransformer> transformer(new SimpleRootWindowTransformer( ash_host_->AsWindowTreeHost()->window(), transform)); - SetRootWindowTransformer(transformer.Pass()); + SetRootWindowTransformer(std::move(transformer)); } void TransformerHelper::SetRootWindowTransformer( scoped_ptr<RootWindowTransformer> transformer) { - transformer_ = transformer.Pass(); + transformer_ = std::move(transformer); aura::WindowTreeHost* host = ash_host_->AsWindowTreeHost(); aura::Window* window = host->window(); window->SetTransform(transformer_->GetTransform());
diff --git a/ash/magnifier/magnification_controller.cc b/ash/magnifier/magnification_controller.cc index 31cd831..e4c5b8e 100644 --- a/ash/magnifier/magnification_controller.cc +++ b/ash/magnifier/magnification_controller.cc
@@ -4,6 +4,8 @@ #include "ash/magnifier/magnification_controller.h" +#include <utility> + #include "ash/accelerators/accelerator_controller.h" #include "ash/accessibility_delegate.h" #include "ash/ash_switches.h" @@ -373,8 +375,9 @@ Shell::GetScreen()->GetDisplayNearestWindow(root_window_); scoped_ptr<RootWindowTransformer> transformer( CreateRootWindowTransformerForDisplay(root_window_, display)); - GetRootWindowController(root_window_)->ash_host()->SetRootWindowTransformer( - transformer.Pass()); + GetRootWindowController(root_window_) + ->ash_host() + ->SetRootWindowTransformer(std::move(transformer)); if (duration_in_ms > 0) is_on_animation_ = true;
diff --git a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc index 59ec7f9..f4c28c4 100644 --- a/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc +++ b/ash/metrics/desktop_task_switch_metric_recorder_unittest.cc
@@ -104,7 +104,7 @@ aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate())); window->SetType(ui::wm::WINDOW_TYPE_NORMAL); window->Init(ui::LAYER_NOT_DRAWN); - return window.Pass(); + return window; } scoped_ptr<aura::Window> @@ -113,7 +113,7 @@ aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate())); window->SetType(ui::wm::WINDOW_TYPE_UNKNOWN); window->Init(ui::LAYER_NOT_DRAWN); - return window.Pass(); + return window; } // Verify user action is recorded when a positionable window is activated given @@ -121,8 +121,7 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivatePositionableWindowWhenNullWindowWasActivatedLast) { scoped_ptr<aura::Window> null_window; - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); ActiveTaskWindowWithUserInput(null_window.get()); ResetActionCounts(); @@ -136,10 +135,8 @@ TEST_F( DesktopTaskSwitchMetricRecorderTest, ActivatePositionableWindowWhenADifferentPositionableWindowWasActivatedLast) { - scoped_ptr<aura::Window> positionable_window_1 = - CreatePositionableWindow().Pass(); - scoped_ptr<aura::Window> positionable_window_2 = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window_1 = CreatePositionableWindow(); + scoped_ptr<aura::Window> positionable_window_2 = CreatePositionableWindow(); ActiveTaskWindowWithUserInput(positionable_window_1.get()); ResetActionCounts(); @@ -153,8 +150,7 @@ TEST_F( DesktopTaskSwitchMetricRecorderTest, ActivatePositionableWindowWhenTheSamePositionableWindowWasActivatedLast) { - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); ActiveTaskWindowWithUserInput(positionable_window.get()); ResetActionCounts(); @@ -168,9 +164,8 @@ TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivatePositionableWindowWhenANonPositionableWindowWasActivatedLast) { scoped_ptr<aura::Window> non_positionable_window = - CreateNonPositionableWindow().Pass(); - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + CreateNonPositionableWindow(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); ActiveTaskWindowWithUserInput(non_positionable_window.get()); ResetActionCounts(); @@ -183,10 +178,9 @@ // activated between two activations of the same positionable window. TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNonPositionableWindowBetweenTwoPositionableWindowActivations) { - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); scoped_ptr<aura::Window> non_positionable_window = - CreateNonPositionableWindow().Pass(); + CreateNonPositionableWindow(); ActiveTaskWindowWithUserInput(positionable_window.get()); ResetActionCounts(); @@ -200,8 +194,7 @@ // Verify user action is not recorded when a null window is activated. TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNullWindow) { - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); scoped_ptr<aura::Window> null_window = nullptr; ActiveTaskWindowWithUserInput(positionable_window.get()); @@ -214,10 +207,9 @@ // Verify user action is not recorded when a non-positionable window is // activated. TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivateNonPositionableWindow) { - scoped_ptr<aura::Window> positionable_window = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window = CreatePositionableWindow(); scoped_ptr<aura::Window> non_positionable_window = - CreateNonPositionableWindow().Pass(); + CreateNonPositionableWindow(); ActiveTaskWindowWithUserInput(positionable_window.get()); ResetActionCounts(); @@ -230,10 +222,8 @@ // INPUT_EVENT. TEST_F(DesktopTaskSwitchMetricRecorderTest, ActivatePositionableWindowWithNonInputEventReason) { - scoped_ptr<aura::Window> positionable_window_1 = - CreatePositionableWindow().Pass(); - scoped_ptr<aura::Window> positionable_window_2 = - CreatePositionableWindow().Pass(); + scoped_ptr<aura::Window> positionable_window_1 = CreatePositionableWindow(); + scoped_ptr<aura::Window> positionable_window_2 = CreatePositionableWindow(); ActiveTaskWindowWithUserInput(positionable_window_1.get()); ResetActionCounts();
diff --git a/ash/rotator/screen_rotation_animator.cc b/ash/rotator/screen_rotation_animator.cc index 8996855..c60cbe2 100644 --- a/ash/rotator/screen_rotation_animator.cc +++ b/ash/rotator/screen_rotation_animator.cc
@@ -5,6 +5,7 @@ #include "ash/rotator/screen_rotation_animator.h" #include <string> +#include <utility> #include <vector> #include "ash/display/display_info.h" @@ -98,8 +99,7 @@ LayerCleanupObserver::LayerCleanupObserver( scoped_ptr<ui::LayerTreeOwner> layer_tree_owner) - : layer_tree_owner_(layer_tree_owner.Pass()), sequence_(nullptr) { -} + : layer_tree_owner_(std::move(layer_tree_owner)), sequence_(nullptr) {} LayerCleanupObserver::~LayerCleanupObserver() { // We must eplicitly detach from |sequence_| because we return true from @@ -176,7 +176,7 @@ root_window->layer()->StackAtTop(old_layer_tree->root()); scoped_ptr<LayerCleanupObserver> layer_cleanup_observer( - new LayerCleanupObserver(old_layer_tree.Pass())); + new LayerCleanupObserver(std::move(old_layer_tree))); Shell::GetInstance()->display_manager()->SetDisplayRotation( display_id, new_rotation, source);
diff --git a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc index ba2f3b1..0101618 100644 --- a/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc +++ b/ash/shelf/shelf_button_pressed_metric_tracker_unittest.cc
@@ -4,6 +4,8 @@ #include "ash/shelf/shelf_button_pressed_metric_tracker.h" +#include <utility> + #include "ash/shelf/shelf.h" #include "ash/test/ash_test_base.h" #include "ash/test/shelf_button_pressed_metric_tracker_test_api.h" @@ -118,7 +120,7 @@ scoped_ptr<base::TickClock> test_tick_clock(new base::SimpleTestTickClock()); tick_clock_ = static_cast<base::SimpleTestTickClock*>(test_tick_clock.get()); - test_api.SetTickClock(test_tick_clock.Pass()); + test_api.SetTickClock(std::move(test_tick_clock)); // Ensure the TickClock->NowTicks() doesn't return base::TimeTicks because // ShelfButtonPressedMetricTracker interprets that value as unset.
diff --git a/ash/shelf/shelf_unittest.cc b/ash/shelf/shelf_unittest.cc index 87d6b1a..ef8be34 100644 --- a/ash/shelf/shelf_unittest.cc +++ b/ash/shelf/shelf_unittest.cc
@@ -3,6 +3,9 @@ // found in the LICENSE file. #include "ash/shelf/shelf.h" + +#include <utility> + #include "ash/shelf/shelf_button.h" #include "ash/shelf/shelf_item_delegate_manager.h" #include "ash/shelf/shelf_model.h" @@ -120,7 +123,7 @@ scoped_ptr<ShelfItemDelegate> delegate( new test::TestShelfItemDelegate(NULL)); item_manager()->SetShelfItemDelegate(shelf_model()->items()[index].id, - delegate.Pass()); + std::move(delegate)); ASSERT_EQ(++button_count, test_api()->GetButtonCount()); ShelfButton* button = test_api()->GetButton(index);
diff --git a/ash/shelf/shelf_view_unittest.cc b/ash/shelf/shelf_view_unittest.cc index 203048e..efd75ad 100644 --- a/ash/shelf/shelf_view_unittest.cc +++ b/ash/shelf/shelf_view_unittest.cc
@@ -333,7 +333,7 @@ protected: void CreateAndSetShelfItemDelegateForID(ShelfID id) { scoped_ptr<ShelfItemDelegate> delegate(new TestShelfItemDelegate(NULL)); - item_manager_->SetShelfItemDelegate(id, delegate.Pass()); + item_manager_->SetShelfItemDelegate(id, std::move(delegate)); } ShelfID AddBrowserShortcut() { @@ -1241,8 +1241,7 @@ ShelfID browser_shelf_id = model_->items()[browser_index_].id; ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker; item_manager_->SetShelfItemDelegate( - browser_shelf_id, - scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass()); + browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker)); // A single click selects the item. SimulateClick(browser_index_); @@ -1267,8 +1266,7 @@ // the shelf item gets selected. ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker; item_manager_->SetShelfItemDelegate( - shelf_id, - scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass()); + shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker)); gfx::Vector2d press_offset(5, 30); gfx::Point press_location = gfx::Point() + press_offset; @@ -1874,8 +1872,7 @@ ShelfID browser_shelf_id = model_->items()[browser_index_].id; ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker; item_manager_->SetShelfItemDelegate( - browser_shelf_id, - scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass()); + browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker)); SimulateClick(browser_index_); EXPECT_EQ(1, @@ -1892,8 +1889,7 @@ selection_tracker->set_item_selected_action( ShelfItemDelegate::kNewWindowCreated); item_manager_->SetShelfItemDelegate( - browser_shelf_id, - scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass()); + browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker)); SimulateClick(browser_index_); EXPECT_EQ(1, user_action_tester.GetActionCount("Launcher_LaunchTask")); @@ -1908,8 +1904,7 @@ ShelfID browser_shelf_id = model_->items()[browser_index_].id; ShelfItemSelectionTracker* selection_tracker = new ShelfItemSelectionTracker; item_manager_->SetShelfItemDelegate( - browser_shelf_id, - scoped_ptr<ShelfItemDelegate>(selection_tracker).Pass()); + browser_shelf_id, scoped_ptr<ShelfItemDelegate>(selection_tracker)); selection_tracker->set_item_selected_action( ShelfItemDelegate::kExistingWindowMinimized);
diff --git a/ash/shelf/shelf_window_watcher.cc b/ash/shelf/shelf_window_watcher.cc index 4bdb024..4146b509 100644 --- a/ash/shelf/shelf_window_watcher.cc +++ b/ash/shelf/shelf_window_watcher.cc
@@ -4,6 +4,8 @@ #include "ash/shelf/shelf_window_watcher.h" +#include <utility> + #include "ash/display/window_tree_host_manager.h" #include "ash/shelf/shelf_constants.h" #include "ash/shelf/shelf_item_delegate_manager.h" @@ -136,7 +138,7 @@ scoped_ptr<ShelfItemDelegate> item_delegate( new ShelfWindowWatcherItemDelegate(window, model_)); // |item_delegate| is owned by |item_delegate_manager_|. - item_delegate_manager_->SetShelfItemDelegate(id, item_delegate.Pass()); + item_delegate_manager_->SetShelfItemDelegate(id, std::move(item_delegate)); model_->Add(item); }
diff --git a/ash/shell.cc b/ash/shell.cc index 6ef78422..e54163d 100644 --- a/ash/shell.cc +++ b/ash/shell.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <string> +#include <utility> #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_delegate.h" @@ -588,7 +589,7 @@ ShelfID app_list_id = shelf_model_->items()[app_list_index].id; DCHECK(app_list_id); shelf_item_delegate_manager_->SetShelfItemDelegate(app_list_id, - controller.Pass()); + std::move(controller)); shelf_window_watcher_.reset(new ShelfWindowWatcher( shelf_model_.get(), shelf_item_delegate_manager_.get())); } @@ -935,7 +936,7 @@ AddShellObserver(overlay_filter_.get()); accelerator_filter_.reset(new ::wm::AcceleratorFilter( - scoped_ptr< ::wm::AcceleratorDelegate>(new AcceleratorDelegate).Pass(), + scoped_ptr<::wm::AcceleratorDelegate>(new AcceleratorDelegate), accelerator_controller_->accelerator_history())); AddPreTargetHandler(accelerator_filter_.get());
diff --git a/ash/shell/app_list.cc b/ash/shell/app_list.cc index b4581d8..a85e4d1 100644 --- a/ash/shell/app_list.cc +++ b/ash/shell/app_list.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <string> +#include <utility> #include <vector> #include "ash/session/session_state_delegate.h" @@ -218,7 +219,7 @@ std::string id = base::IntToString(i); scoped_ptr<WindowTypeShelfItem> shelf_item( new WindowTypeShelfItem(id, type)); - model_->AddItem(shelf_item.Pass()); + model_->AddItem(std::move(shelf_item)); } }
diff --git a/ash/shell/content/client/shell_content_browser_client.cc b/ash/shell/content/client/shell_content_browser_client.cc index 287b5968..1329a65 100644 --- a/ash/shell/content/client/shell_content_browser_client.cc +++ b/ash/shell/content/client/shell_content_browser_client.cc
@@ -4,6 +4,8 @@ #include "ash/shell/content/client/shell_content_browser_client.h" +#include <utility> + #include "ash/shell/content/client/shell_browser_main_parts.h" #include "base/command_line.h" #include "content/shell/browser/shell_browser_context.h" @@ -30,7 +32,7 @@ content::ShellBrowserContext* shell_context = static_cast<content::ShellBrowserContext*>(content_browser_context); return shell_context->CreateRequestContext(protocol_handlers, - request_interceptors.Pass()); + std::move(request_interceptors)); } content::ShellBrowserContext* ShellContentBrowserClient::browser_context() {
diff --git a/ash/shell/window_type_launcher.cc b/ash/shell/window_type_launcher.cc index c681be8..4805891 100644 --- a/ash/shell/window_type_launcher.cc +++ b/ash/shell/window_type_launcher.cc
@@ -4,6 +4,8 @@ #include "ash/shell/window_type_launcher.h" +#include <utility> + #include "ash/content/shell_content_state.h" #include "ash/root_window_controller.h" #include "ash/session/session_state_delegate.h" @@ -320,9 +322,12 @@ "test-id"), message_center::RichNotificationData(), NULL /* delegate */)); - ash::Shell::GetPrimaryRootWindowController()->shelf()->status_area_widget() - ->web_notification_tray()->message_center() - ->AddNotification(notification.Pass()); + ash::Shell::GetPrimaryRootWindowController() + ->shelf() + ->status_area_widget() + ->web_notification_tray() + ->message_center() + ->AddNotification(std::move(notification)); } else if (sender == examples_button_) { views::examples::ShowExamplesWindowWithContent( views::examples::DO_NOTHING_ON_CLOSE,
diff --git a/ash/shell/window_watcher.cc b/ash/shell/window_watcher.cc index bd5d148..e8163b2 100644 --- a/ash/shell/window_watcher.cc +++ b/ash/shell/window_watcher.cc
@@ -4,6 +4,8 @@ #include "ash/shell/window_watcher.h" +#include <utility> + #include "ash/display/window_tree_host_manager.h" #include "ash/shelf/shelf.h" #include "ash/shelf/shelf_item_delegate_manager.h" @@ -118,7 +120,7 @@ Shell::GetInstance()->shelf_item_delegate_manager(); scoped_ptr<ShelfItemDelegate> delegate( new WindowWatcherShelfItemDelegate(id, this)); - manager->SetShelfItemDelegate(id, delegate.Pass()); + manager->SetShelfItemDelegate(id, std::move(delegate)); SetShelfIDForWindow(id, new_window); }
diff --git a/ash/system/audio/tray_audio.cc b/ash/system/audio/tray_audio.cc index 41340bd5..332dd44 100644 --- a/ash/system/audio/tray_audio.cc +++ b/ash/system/audio/tray_audio.cc
@@ -5,6 +5,7 @@ #include "ash/system/audio/tray_audio.h" #include <cmath> +#include <utility> #include "ash/ash_constants.h" #include "ash/display/display_manager.h" @@ -43,7 +44,7 @@ TrayAudio::TrayAudio(SystemTray* system_tray, scoped_ptr<system::TrayAudioDelegate> audio_delegate) : TrayImageItem(system_tray, IDR_AURA_UBER_TRAY_VOLUME_MUTE), - audio_delegate_(audio_delegate.Pass()), + audio_delegate_(std::move(audio_delegate)), volume_view_(NULL), pop_up_volume_view_(false) { Shell::GetInstance()->system_tray_notifier()->AddAudioObserver(this);
diff --git a/ash/system/locale/locale_notification_controller.cc b/ash/system/locale/locale_notification_controller.cc index 76df066..575002d 100644 --- a/ash/system/locale/locale_notification_controller.cc +++ b/ash/system/locale/locale_notification_controller.cc
@@ -4,6 +4,8 @@ #include "ash/system/locale/locale_notification_controller.h" +#include <utility> + #include "ash/shell.h" #include "ash/system/system_notifier.h" #include "ash/system/tray/system_tray_notifier.h" @@ -109,7 +111,8 @@ message_center::NotifierId(message_center::NotifierId::SYSTEM_COMPONENT, system_notifier::kNotifierLocale), optional, new LocaleNotificationDelegate(delegate))); - message_center::MessageCenter::Get()->AddNotification(notification.Pass()); + message_center::MessageCenter::Get()->AddNotification( + std::move(notification)); } } // namespace ash
diff --git a/ash/system/tray/default_system_tray_delegate.cc b/ash/system/tray/default_system_tray_delegate.cc index ea163393..649a9f3 100644 --- a/ash/system/tray/default_system_tray_delegate.cc +++ b/ash/system/tray/default_system_tray_delegate.cc
@@ -5,6 +5,7 @@ #include "ash/system/tray/default_system_tray_delegate.h" #include <string> +#include <utility> #include "ash/networking_config_delegate.h" #include "ash/session/session_state_delegate.h" @@ -82,7 +83,7 @@ void DefaultSystemTrayDelegate::SetVolumeControlDelegate( scoped_ptr<VolumeControlDelegate> delegate) { - volume_control_delegate_ = delegate.Pass(); + volume_control_delegate_ = std::move(delegate); } int DefaultSystemTrayDelegate::GetSystemTrayMenuWidth() {
diff --git a/ash/system/user/user_view.cc b/ash/system/user/user_view.cc index 4d1b538..2a693251 100644 --- a/ash/system/user/user_view.cc +++ b/ash/system/user/user_view.cc
@@ -5,6 +5,7 @@ #include "ash/system/user/user_view.h" #include <algorithm> +#include <utility> #include "ash/multi_profile_uma.h" #include "ash/popup_message.h" @@ -351,7 +352,7 @@ views::Button::STATE_PRESSED, views::Painter::CreateImageGridPainter( kPublicAccountLogoutButtonBorderImagesHovered)); - logout_button_->SetBorder(border.Pass()); + logout_button_->SetBorder(std::move(border)); } AddChildView(logout_button_); }
diff --git a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc index ad4358d8..9884e4b 100644 --- a/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc +++ b/ash/system/web_notification/ash_popup_alignment_delegate_unittest.cc
@@ -4,6 +4,7 @@ #include "ash/system/web_notification/ash_popup_alignment_delegate.h" +#include <utility> #include <vector> #include "ash/display/display_manager.h" @@ -69,7 +70,7 @@ alignment_delegate_.reset(); return; } - alignment_delegate_ = delegate.Pass(); + alignment_delegate_ = std::move(delegate); UpdateWorkArea(alignment_delegate_.get(), Shell::GetScreen()->GetPrimaryDisplay()); }
diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc index 79269a42..946e3ce 100644 --- a/ash/system/web_notification/web_notification_tray_unittest.cc +++ b/ash/system/web_notification/web_notification_tray_unittest.cc
@@ -4,6 +4,7 @@ #include "ash/system/web_notification/web_notification_tray.h" +#include <utility> #include <vector> #include "ash/display/display_manager.h" @@ -107,7 +108,7 @@ base::ASCIIToUTF16("www.test.org"), GURL(), message_center::NotifierId(), message_center::RichNotificationData(), NULL /* delegate */)); - GetMessageCenter()->AddNotification(notification.Pass()); + GetMessageCenter()->AddNotification(std::move(notification)); } void UpdateNotification(const std::string& old_id, @@ -120,7 +121,7 @@ base::ASCIIToUTF16("www.test.org"), GURL(), message_center::NotifierId(), message_center::RichNotificationData(), NULL /* delegate */)); - GetMessageCenter()->UpdateNotification(old_id, notification.Pass()); + GetMessageCenter()->UpdateNotification(old_id, std::move(notification)); } void RemoveNotification(const std::string& id) {
diff --git a/ash/test/test_shelf_delegate.cc b/ash/test/test_shelf_delegate.cc index 114d736..232c46c 100644 --- a/ash/test/test_shelf_delegate.cc +++ b/ash/test/test_shelf_delegate.cc
@@ -4,6 +4,8 @@ #include "ash/test/test_shelf_delegate.h" +#include <utility> + #include "ash/shelf/shelf_item_delegate_manager.h" #include "ash/shelf/shelf_model.h" #include "ash/shelf/shelf_util.h" @@ -54,7 +56,7 @@ Shell::GetInstance()->shelf_item_delegate_manager(); // |manager| owns TestShelfItemDelegate. scoped_ptr<ShelfItemDelegate> delegate(new TestShelfItemDelegate(window)); - manager->SetShelfItemDelegate(id, delegate.Pass()); + manager->SetShelfItemDelegate(id, std::move(delegate)); SetShelfIDForWindow(id, window); }
diff --git a/ash/touch/touch_hud_debug.cc b/ash/touch/touch_hud_debug.cc index bac5c7d..5c85f5f 100644 --- a/ash/touch/touch_hud_debug.cc +++ b/ash/touch/touch_hud_debug.cc
@@ -114,7 +114,7 @@ value->SetInteger("tracking_id", tracking_id); value->SetInteger("source_device", source_device); - return value.Pass(); + return value; } int id; @@ -157,7 +157,7 @@ scoped_ptr<base::ListValue> list(new base::ListValue()); for (const_iterator i = log_.begin(); i != log_.end(); ++i) list->Append((*i).GetAsDictionary().release()); - return list.Pass(); + return list; } void Reset() { @@ -194,7 +194,7 @@ if (!traces_[i].log().empty()) list->Append(traces_[i].GetAsList().release()); } - return list.Pass(); + return list; } int GetTraceIndex(int touch_id) const { @@ -370,7 +370,7 @@ value->Set(base::Int64ToString(hud->display_id()), list.release()); } } - return value.Pass(); + return value; } void TouchHudDebug::ChangeToNextMode() {
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc index aa075c5..a0f0d84 100644 --- a/ash/wm/lock_state_controller.cc +++ b/ash/wm/lock_state_controller.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <string> +#include <utility> #include "ash/accessibility_delegate.h" #include "ash/ash_switches.h" @@ -98,7 +99,7 @@ void LockStateController::SetDelegate( scoped_ptr<LockStateControllerDelegate> delegate) { - delegate_ = delegate.Pass(); + delegate_ = std::move(delegate); } void LockStateController::AddObserver(LockStateObserver* observer) {
diff --git a/ash/wm/lock_state_controller_unittest.cc b/ash/wm/lock_state_controller_unittest.cc index a9a1387..0f784b3 100644 --- a/ash/wm/lock_state_controller_unittest.cc +++ b/ash/wm/lock_state_controller_unittest.cc
@@ -4,6 +4,8 @@ #include "ash/wm/lock_state_controller.h" +#include <utility> + #include "ash/session/session_state_delegate.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -58,7 +60,8 @@ test_animator_ = new TestSessionStateAnimator; lock_state_controller_ = Shell::GetInstance()->lock_state_controller(); - lock_state_controller_->SetDelegate(lock_state_controller_delegate.Pass()); + lock_state_controller_->SetDelegate( + std::move(lock_state_controller_delegate)); lock_state_controller_->set_animator_for_test(test_animator_); test_api_.reset(new LockStateController::TestApi(lock_state_controller_));
diff --git a/ash/wm/lock_window_state.cc b/ash/wm/lock_window_state.cc index 6230dd1..7e5b4ec 100644 --- a/ash/wm/lock_window_state.cc +++ b/ash/wm/lock_window_state.cc
@@ -4,6 +4,8 @@ #include "ash/wm/lock_window_state.h" +#include <utility> + #include "ash/display/display_manager.h" #include "ash/screen_util.h" #include "ash/shell.h" @@ -112,7 +114,7 @@ wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) { scoped_ptr<wm::WindowState::State> lock_state(new LockWindowState(window)); scoped_ptr<wm::WindowState::State> old_state( - wm::GetWindowState(window)->SetStateObject(lock_state.Pass())); + wm::GetWindowState(window)->SetStateObject(std::move(lock_state))); return wm::GetWindowState(window); }
diff --git a/ash/wm/maximize_mode/maximize_mode_controller.cc b/ash/wm/maximize_mode/maximize_mode_controller.cc index c732863..146a378 100644 --- a/ash/wm/maximize_mode/maximize_mode_controller.cc +++ b/ash/wm/maximize_mode/maximize_mode_controller.cc
@@ -4,6 +4,8 @@ #include "ash/wm/maximize_mode/maximize_mode_controller.h" +#include <utility> + #include "ash/accelerators/accelerator_controller.h" #include "ash/accelerators/accelerator_table.h" #include "ash/ash_switches.h" @@ -406,7 +408,7 @@ void MaximizeModeController::SetTickClockForTest( scoped_ptr<base::TickClock> tick_clock) { DCHECK(tick_clock_); - tick_clock_ = tick_clock.Pass(); + tick_clock_ = std::move(tick_clock); } } // namespace ash
diff --git a/ash/wm/maximize_mode/maximize_mode_window_state.cc b/ash/wm/maximize_mode/maximize_mode_window_state.cc index e8da85a..3691dcaa 100644 --- a/ash/wm/maximize_mode/maximize_mode_window_state.cc +++ b/ash/wm/maximize_mode/maximize_mode_window_state.cc
@@ -4,6 +4,8 @@ #include "ash/wm/maximize_mode/maximize_mode_window_state.h" +#include <utility> + #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/shell_window_ids.h" @@ -95,9 +97,9 @@ creator_(creator), current_state_type_(wm::GetWindowState(window)->GetStateType()), defer_bounds_updates_(false) { - old_state_.reset( - wm::GetWindowState(window)->SetStateObject( - scoped_ptr<State>(this).Pass()).release()); + old_state_.reset(wm::GetWindowState(window) + ->SetStateObject(scoped_ptr<State>(this)) + .release()); } MaximizeModeWindowState::~MaximizeModeWindowState() { @@ -107,7 +109,7 @@ void MaximizeModeWindowState::LeaveMaximizeMode(wm::WindowState* window_state) { // Note: When we return we will destroy ourselves with the |our_reference|. scoped_ptr<wm::WindowState::State> our_reference = - window_state->SetStateObject(old_state_.Pass()); + window_state->SetStateObject(std::move(old_state_)); } void MaximizeModeWindowState::SetDeferBoundsUpdates(bool defer_bounds_updates) {
diff --git a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc index 2f7fde2..3c7e09e9 100644 --- a/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc +++ b/ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc
@@ -4,9 +4,10 @@ #include "ash/wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h" -#include <set> -#include <X11/extensions/XInput2.h> #include <X11/Xlib.h> +#include <X11/extensions/XInput2.h> +#include <set> +#include <utility> #include "ash/display/window_tree_host_manager.h" #include "ash/screen_util.h" @@ -112,7 +113,7 @@ excepted_keys->insert(ui::VKEY_VOLUME_DOWN); excepted_keys->insert(ui::VKEY_VOLUME_UP); excepted_keys->insert(ui::VKEY_POWER); - device_data_manager->SetDisabledKeyboardAllowedKeys(excepted_keys.Pass()); + device_data_manager->SetDisabledKeyboardAllowedKeys(std::move(excepted_keys)); ui::PlatformEventSource::GetInstance()->AddPlatformEventObserver(this); }
diff --git a/ash/wm/overview/window_grid.cc b/ash/wm/overview/window_grid.cc index 713c7cb..ec3b362 100644 --- a/ash/wm/overview/window_grid.cc +++ b/ash/wm/overview/window_grid.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <functional> #include <set> +#include <utility> #include <vector> #include "ash/ash_switches.h" @@ -57,8 +58,7 @@ CleanupWidgetAfterAnimationObserver::CleanupWidgetAfterAnimationObserver( scoped_ptr<views::Widget> widget) - : widget_(widget.Pass()) { -} + : widget_(std::move(widget)) {} CleanupWidgetAfterAnimationObserver::~CleanupWidgetAfterAnimationObserver() { } @@ -477,7 +477,7 @@ // CleanupWidgetAfterAnimationObserver will delete itself (and the // widget) when the movement animation is complete. animation_settings.AddObserver( - new CleanupWidgetAfterAnimationObserver(selection_widget_.Pass())); + new CleanupWidgetAfterAnimationObserver(std::move(selection_widget_))); old_selection->SetOpacity(0); old_selection->GetNativeWindow()->SetBounds( old_selection->GetNativeWindow()->bounds() + fade_out_direction);
diff --git a/ash/wm/overview/window_selector.cc b/ash/wm/overview/window_selector.cc index 1699ceb..50d82da 100644 --- a/ash/wm/overview/window_selector.cc +++ b/ash/wm/overview/window_selector.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <functional> #include <set> +#include <utility> #include <vector> #include "ash/accessibility_delegate.h" @@ -287,7 +288,7 @@ if (grid->empty()) continue; num_items_ += grid->size(); - grid_list_.push_back(grid.Pass()); + grid_list_.push_back(std::move(grid)); } {
diff --git a/ash/wm/overview/window_selector_unittest.cc b/ash/wm/overview/window_selector_unittest.cc index cddcf65..54cbb9da 100644 --- a/ash/wm/overview/window_selector_unittest.cc +++ b/ash/wm/overview/window_selector_unittest.cc
@@ -124,7 +124,7 @@ widget->Init(params); widget->Show(); ParentWindowInPrimaryRootWindow(widget->GetNativeWindow()); - return widget.Pass(); + return widget; } aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
diff --git a/ash/wm/panels/panel_layout_manager.cc b/ash/wm/panels/panel_layout_manager.cc index 412a8d1..9694cc2 100644 --- a/ash/wm/panels/panel_layout_manager.cc +++ b/ash/wm/panels/panel_layout_manager.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <map> +#include <utility> #include "ash/screen_util.h" #include "ash/shelf/shelf.h" @@ -544,7 +545,7 @@ if (!shelf_hidden) { if (restore_windows_on_shelf_visible_) { scoped_ptr<aura::WindowTracker> restore_windows( - restore_windows_on_shelf_visible_.Pass()); + std::move(restore_windows_on_shelf_visible_)); for (aura::Window::Windows::const_iterator iter = restore_windows->windows().begin(); iter != restore_windows->windows().end(); ++iter) { @@ -568,7 +569,7 @@ wm::GetWindowState(window)->Minimize(); } } - restore_windows_on_shelf_visible_ = minimized_windows.Pass(); + restore_windows_on_shelf_visible_ = std::move(minimized_windows); } ////////////////////////////////////////////////////////////////////////////////
diff --git a/ash/wm/window_animations.cc b/ash/wm/window_animations.cc index 93af37a..fc142247 100644 --- a/ash/wm/window_animations.cc +++ b/ash/wm/window_animations.cc
@@ -5,8 +5,8 @@ #include "ash/wm/window_animations.h" #include <math.h> - #include <algorithm> +#include <utility> #include <vector> #include "ash/screen_util.h" @@ -271,8 +271,7 @@ // Takes ownership of |layer| and its child layers. CrossFadeObserver(aura::Window* window, scoped_ptr<ui::LayerTreeOwner> layer_owner) - : window_(window), - layer_owner_(layer_owner.Pass()) { + : window_(window), layer_owner_(std::move(layer_owner)) { window_->AddObserver(this); layer_owner_->root()->GetCompositor()->AddObserver(this); } @@ -342,7 +341,8 @@ ui::ScopedLayerAnimationSettings settings(old_layer->GetAnimator()); // Animation observer owns the old layer and deletes itself. - settings.AddObserver(new CrossFadeObserver(window, old_layer_owner.Pass())); + settings.AddObserver( + new CrossFadeObserver(window, std::move(old_layer_owner))); settings.SetTransitionDuration(duration); settings.SetTweenType(tween_type); gfx::Transform out_transform;
diff --git a/ash/wm/window_state.cc b/ash/wm/window_state.cc index b314c95..21a69d9 100644 --- a/ash/wm/window_state.cc +++ b/ash/wm/window_state.cc
@@ -4,6 +4,8 @@ #include "ash/wm/window_state.h" +#include <utility> + #include "ash/ash_switches.h" #include "ash/root_window_controller.h" #include "ash/screen_util.h" @@ -95,7 +97,7 @@ void WindowState::SetDelegate(scoped_ptr<WindowStateDelegate> delegate) { DCHECK(!delegate_.get()); - delegate_ = delegate.Pass(); + delegate_ = std::move(delegate); } WindowStateType WindowState::GetStateType() const { @@ -284,10 +286,10 @@ scoped_ptr<WindowState::State> WindowState::SetStateObject( scoped_ptr<WindowState::State> new_state) { current_state_->DetachState(this); - scoped_ptr<WindowState::State> old_object = current_state_.Pass(); - current_state_ = new_state.Pass(); + scoped_ptr<WindowState::State> old_object = std::move(current_state_); + current_state_ = std::move(new_state); current_state_->AttachState(this, old_object.get()); - return old_object.Pass(); + return old_object; } void WindowState::SetPreAutoManageWindowBounds( @@ -477,7 +479,7 @@ else old_layer->parent()->StackAbove(new_layer, old_layer); - CrossFadeAnimation(window_, old_layer_owner.Pass(), gfx::Tween::EASE_OUT); + CrossFadeAnimation(window_, std::move(old_layer_owner), gfx::Tween::EASE_OUT); } WindowState* GetActiveWindowState() {
diff --git a/ash/wm/window_state_unittest.cc b/ash/wm/window_state_unittest.cc index ecfbc6a..4c95ce7 100644 --- a/ash/wm/window_state_unittest.cc +++ b/ash/wm/window_state_unittest.cc
@@ -4,6 +4,8 @@ #include "ash/wm/window_state.h" +#include <utility> + #include "ash/screen_util.h" #include "ash/shell.h" #include "ash/test/ash_test_base.h" @@ -306,11 +308,11 @@ scoped_ptr<aura::Window> window(CreateTestWindowInShellWithId(0)); WindowState* window_state = GetWindowState(window.get()); EXPECT_FALSE(window_state->IsMaximized()); - scoped_ptr<WindowState::State> old(window_state->SetStateObject( - scoped_ptr<WindowState::State> (new AlwaysMaximizeTestState( - window_state->GetStateType()))).Pass()); + scoped_ptr<WindowState::State> old( + window_state->SetStateObject(scoped_ptr<WindowState::State>( + new AlwaysMaximizeTestState(window_state->GetStateType())))); EXPECT_TRUE(window_state->IsMaximized()); - window_state->SetStateObject(old.Pass()); + window_state->SetStateObject(std::move(old)); EXPECT_FALSE(window_state->IsMaximized()); }
diff --git a/ash/wm/workspace/phantom_window_controller.cc b/ash/wm/workspace/phantom_window_controller.cc index ee2d458..d7af625 100644 --- a/ash/wm/workspace/phantom_window_controller.cc +++ b/ash/wm/workspace/phantom_window_controller.cc
@@ -143,7 +143,7 @@ base::TimeDelta::FromMilliseconds(kAnimationDurationMs)); widget_layer->SetOpacity(1); - return phantom_widget.Pass(); + return phantom_widget; } } // namespace ash
diff --git a/ash/wm/workspace/workspace_layout_manager_unittest.cc b/ash/wm/workspace/workspace_layout_manager_unittest.cc index 9d26de51..1ac8b69 100644 --- a/ash/wm/workspace/workspace_layout_manager_unittest.cc +++ b/ash/wm/workspace/workspace_layout_manager_unittest.cc
@@ -5,6 +5,7 @@ #include "ash/wm/workspace/workspace_layout_manager.h" #include <string> +#include <utility> #include "ash/display/display_layout.h" #include "ash/display/display_manager.h" @@ -834,7 +835,7 @@ backdrop.reset(new ash::WorkspaceBackdropDelegate(default_container_)); } (static_cast<WorkspaceLayoutManager*>(default_container_->layout_manager())) - ->SetMaximizeBackdropDelegate(backdrop.Pass()); + ->SetMaximizeBackdropDelegate(std::move(backdrop)); // Closing and / or opening can be a delayed operation. base::MessageLoop::current()->RunUntilIdle(); }
diff --git a/ash/wm/workspace_controller.cc b/ash/wm/workspace_controller.cc index d186b0d..bea54a92 100644 --- a/ash/wm/workspace_controller.cc +++ b/ash/wm/workspace_controller.cc
@@ -4,6 +4,8 @@ #include "ash/wm/workspace_controller.h" +#include <utility> + #include "ash/root_window_controller.h" #include "ash/shelf/shelf_layout_manager.h" #include "ash/shell.h" @@ -133,7 +135,7 @@ void WorkspaceController::SetMaximizeBackdropDelegate( scoped_ptr<WorkspaceLayoutManagerDelegate> delegate) { - layout_manager_->SetMaximizeBackdropDelegate(delegate.Pass()); + layout_manager_->SetMaximizeBackdropDelegate(std::move(delegate)); } } // namespace ash
diff --git a/base/BUILD.gn b/base/BUILD.gn index b9463e0..7a95a2f 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn
@@ -211,7 +211,6 @@ "base64url.h", "base_export.h", "base_switches.h", - "basictypes.h", "big_endian.cc", "big_endian.h", "bind.h",
diff --git a/base/allocator/BUILD.gn b/base/allocator/BUILD.gn index 04ca97c..018aa46 100644 --- a/base/allocator/BUILD.gn +++ b/base/allocator/BUILD.gn
@@ -126,7 +126,6 @@ "$tcmalloc_dir/src/base/atomicops-internals-windows.h", "$tcmalloc_dir/src/base/atomicops.h", "$tcmalloc_dir/src/base/atomicops_internals_portable.h", - "$tcmalloc_dir/src/base/basictypes.h", "$tcmalloc_dir/src/base/commandlineflags.h", "$tcmalloc_dir/src/base/cycleclock.h",
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index 414e510..fa3b541 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp
@@ -108,7 +108,6 @@ '<(tcmalloc_dir)/src/base/atomicops-internals-windows.h', '<(tcmalloc_dir)/src/base/atomicops_internals_portable.h', '<(tcmalloc_dir)/src/base/atomicops.h', - '<(tcmalloc_dir)/src/base/basictypes.h', '<(tcmalloc_dir)/src/base/commandlineflags.h', '<(tcmalloc_dir)/src/base/cycleclock.h', # We don't list dynamic_annotations.c since its copy is already @@ -232,7 +231,6 @@ '<(tcmalloc_dir)/src/base/atomicops-internals-x86-msvc.h', '<(tcmalloc_dir)/src/base/atomicops-internals-x86.h', '<(tcmalloc_dir)/src/base/atomicops.h', - '<(tcmalloc_dir)/src/base/basictypes.h', '<(tcmalloc_dir)/src/base/commandlineflags.h', '<(tcmalloc_dir)/src/base/cycleclock.h', '<(tcmalloc_dir)/src/base/elf_mem_image.h',
diff --git a/base/base.gypi b/base/base.gypi index 80771c3..2148f747 100644 --- a/base/base.gypi +++ b/base/base.gypi
@@ -111,7 +111,6 @@ 'base_paths_win.cc', 'base_paths_win.h', 'base_switches.h', - 'basictypes.h', 'big_endian.cc', 'big_endian.h', 'bind.h',
diff --git a/base/basictypes.h b/base/basictypes.h deleted file mode 100644 index eba9753..0000000 --- a/base/basictypes.h +++ /dev/null
@@ -1,26 +0,0 @@ -// 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 BASE_BASICTYPES_H_ -#define BASE_BASICTYPES_H_ - -#include <limits.h> // So we can set the bounds of our types. -#include <stddef.h> // For size_t. -#include <stdint.h> // For intptr_t. - -#include "base/macros.h" -#include "build/build_config.h" - -// DEPRECATED: Use (u)int{8,16,32,64}_t instead (and include <stdint.h>). -// http://crbug.com/138542 -typedef int8_t int8; -typedef uint8_t uint8; -typedef int16_t int16; -typedef uint16_t uint16; -typedef int32_t int32; -typedef uint32_t uint32; -typedef int64_t int64; -typedef uint64_t uint64; - -#endif // BASE_BASICTYPES_H_
diff --git a/base/callback_list_unittest.nc b/base/callback_list_unittest.nc index fd83d02d..45ac994f 100644 --- a/base/callback_list_unittest.nc +++ b/base/callback_list_unittest.nc
@@ -7,7 +7,6 @@ #include "base/callback_list.h" -#include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" #include "base/macros.h"
diff --git a/base/memory/scoped_ptr_unittest.nc b/base/memory/scoped_ptr_unittest.nc index 24e2c43..ebbfdb6 100644 --- a/base/memory/scoped_ptr_unittest.nc +++ b/base/memory/scoped_ptr_unittest.nc
@@ -5,7 +5,7 @@ // This is a "No Compile Test" suite. // http://dev.chromium.org/developers/testing/no-compile-tests -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/ref_counted.h"
diff --git a/cloud_print/service/service_state.cc b/cloud_print/service/service_state.cc index 33d771d..1c644ce 100644 --- a/cloud_print/service/service_state.cc +++ b/cloud_print/service/service_state.cc
@@ -5,6 +5,7 @@ #include "cloud_print/service/service_state.h" #include <stdint.h> +#include <utility> #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -149,7 +150,7 @@ xmpp_auth_token_); base::DictionaryValue services; - services.Set(kCloudPrintJsonName, cloud_print.Pass()); + services.Set(kCloudPrintJsonName, std::move(cloud_print)); std::string json; base::JSONWriter::WriteWithOptions( @@ -185,7 +186,7 @@ scoped_ptr<net::UploadElementReader> reader( net::UploadOwnedBytesElementReader::CreateWithString(post_body)); request->set_upload( - net::ElementsUploadDataStream::CreateWithReader(reader.Pass(), 0)); + net::ElementsUploadDataStream::CreateWithReader(std::move(reader), 0)); request->SetExtraRequestHeaderByName( "Content-Type", "application/x-www-form-urlencoded", true); request->set_method("POST");
diff --git a/components/policy/tools/generate_policy_source.py b/components/policy/tools/generate_policy_source.py index 8039538..634d61f 100755 --- a/components/policy/tools/generate_policy_source.py +++ b/components/policy/tools/generate_policy_source.py
@@ -298,7 +298,6 @@ '\n' '#include <string>\n' '\n' - '#include "base/basictypes.h"\n' '#include "base/values.h"\n' '#include "components/policy/core/common/policy_details.h"\n' '#include "components/policy/core/common/policy_map.h"\n' @@ -858,7 +857,7 @@ f.write('#ifndef CHROME_COMMON_POLICY_RISK_TAG_H_\n' '#define CHROME_COMMON_POLICY_RISK_TAG_H_\n' '\n' - '#include "base/basictypes.h"\n' + '#include <stddef.h>\n' '\n' 'namespace policy {\n' '\n' + \ @@ -1000,7 +999,6 @@ #include <limits> #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/json/json_reader.h" #include "base/logging.h" @@ -1025,7 +1023,7 @@ value > std::numeric_limits<int>::max()) { LOG(WARNING) << "Integer value " << value << " out of numeric limits, ignoring."; - return NULL; + return nullptr; } return new base::FundamentalValue(static_cast<int>(value));
diff --git a/content/browser/loader/power_save_block_resource_throttle.cc b/content/browser/loader/power_save_block_resource_throttle.cc index 42e0b0e..76afe12 100644 --- a/content/browser/loader/power_save_block_resource_throttle.cc +++ b/content/browser/loader/power_save_block_resource_throttle.cc
@@ -14,8 +14,9 @@ } // namespace -PowerSaveBlockResourceThrottle::PowerSaveBlockResourceThrottle() { -} +PowerSaveBlockResourceThrottle::PowerSaveBlockResourceThrottle( + const std::string& host) + : host_(host) {} PowerSaveBlockResourceThrottle::~PowerSaveBlockResourceThrottle() { } @@ -41,7 +42,7 @@ void PowerSaveBlockResourceThrottle::ActivatePowerSaveBlocker() { power_save_blocker_ = PowerSaveBlocker::Create( PowerSaveBlocker::kPowerSaveBlockPreventAppSuspension, - PowerSaveBlocker::kReasonOther, "Uploading data"); + PowerSaveBlocker::kReasonOther, "Uploading data to " + host_); } } // namespace content
diff --git a/content/browser/loader/power_save_block_resource_throttle.h b/content/browser/loader/power_save_block_resource_throttle.h index 502eda5..4c67842 100644 --- a/content/browser/loader/power_save_block_resource_throttle.h +++ b/content/browser/loader/power_save_block_resource_throttle.h
@@ -5,6 +5,8 @@ #ifndef CONTENT_BROWSER_LOADER_POWER_SAVE_BLOCK_RESOURCE_THROTTLE_H_ #define CONTENT_BROWSER_LOADER_POWER_SAVE_BLOCK_RESOURCE_THROTTLE_H_ +#include <string> + #include "base/compiler_specific.h" #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -18,7 +20,7 @@ // This ResourceThrottle blocks power save until large upload request finishes. class PowerSaveBlockResourceThrottle : public ResourceThrottle { public: - PowerSaveBlockResourceThrottle(); + explicit PowerSaveBlockResourceThrottle(const std::string& host); ~PowerSaveBlockResourceThrottle() override; // ResourceThrottle overrides: @@ -29,6 +31,7 @@ private: void ActivatePowerSaveBlocker(); + const std::string host_; base::OneShotTimer timer_; scoped_ptr<PowerSaveBlocker> power_save_blocker_;
diff --git a/content/browser/loader/resource_dispatcher_host_impl.cc b/content/browser/loader/resource_dispatcher_host_impl.cc index f1d97ab..63d14529 100644 --- a/content/browser/loader/resource_dispatcher_host_impl.cc +++ b/content/browser/loader/resource_dispatcher_host_impl.cc
@@ -1594,7 +1594,8 @@ if (request->has_upload()) { // Block power save while uploading data. - throttles.push_back(new PowerSaveBlockResourceThrottle()); + throttles.push_back( + new PowerSaveBlockResourceThrottle(request->url().host())); } // TODO(ricea): Stop looking this up so much.
diff --git a/content/browser/renderer_host/font_utils_linux.cc b/content/browser/renderer_host/font_utils_linux.cc index 7f67a24..715923d 100644 --- a/content/browser/renderer_host/font_utils_linux.cc +++ b/content/browser/renderer_host/font_utils_linux.cc
@@ -5,6 +5,7 @@ #include <fcntl.h> #include <fontconfig/fontconfig.h> #include <stddef.h> +#include <string.h> #include <sys/stat.h> #include <sys/types.h>
diff --git a/crypto/nss_key_util.cc b/crypto/nss_key_util.cc index f48cb0f..3e03489 100644 --- a/crypto/nss_key_util.cc +++ b/crypto/nss_key_util.cc
@@ -137,7 +137,7 @@ ScopedSECKEYPrivateKey key( PK11_FindKeyByKeyID(item->module->slots[i], cka_id.get(), nullptr)); if (key) - return key.Pass(); + return key; } }
diff --git a/dbus/exported_object.cc b/dbus/exported_object.cc index 3054c35..e4cd1a4 100644 --- a/dbus/exported_object.cc +++ b/dbus/exported_object.cc
@@ -5,6 +5,7 @@ #include "dbus/exported_object.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -264,7 +265,7 @@ base::Passed(&response), start_time)); } else { - OnMethodCompleted(method_call.Pass(), response.Pass(), start_time); + OnMethodCompleted(std::move(method_call), std::move(response), start_time); } }
diff --git a/dbus/message.cc b/dbus/message.cc index 2de38612..8a58dbaa3 100644 --- a/dbus/message.cc +++ b/dbus/message.cc
@@ -404,19 +404,19 @@ scoped_ptr<Response> response(new Response); response->Init(raw_message); - return response.Pass(); + return response; } scoped_ptr<Response> Response::FromMethodCall(MethodCall* method_call) { scoped_ptr<Response> response(new Response); response->Init(dbus_message_new_method_return(method_call->raw_message())); - return response.Pass(); + return response; } scoped_ptr<Response> Response::CreateEmpty() { scoped_ptr<Response> response(new Response); response->Init(dbus_message_new(DBUS_MESSAGE_TYPE_METHOD_RETURN)); - return response.Pass(); + return response; } // @@ -432,7 +432,7 @@ scoped_ptr<ErrorResponse> response(new ErrorResponse); response->Init(raw_message); - return response.Pass(); + return response; } scoped_ptr<ErrorResponse> ErrorResponse::FromMethodCall( @@ -443,7 +443,7 @@ response->Init(dbus_message_new_error(method_call->raw_message(), error_name.c_str(), error_message.c_str())); - return response.Pass(); + return response; } //
diff --git a/dbus/object_proxy.cc b/dbus/object_proxy.cc index fc7d1993..e7d1f22 100644 --- a/dbus/object_proxy.cc +++ b/dbus/object_proxy.cc
@@ -2,9 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "dbus/bus.h" +#include "dbus/object_proxy.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -15,10 +16,10 @@ #include "base/task_runner_util.h" #include "base/threading/thread.h" #include "base/threading/thread_restrictions.h" +#include "dbus/bus.h" #include "dbus/dbus_statistics.h" #include "dbus/message.h" #include "dbus/object_path.h" -#include "dbus/object_proxy.h" #include "dbus/scoped_dbus_error.h" #include "dbus/util.h" @@ -476,7 +477,7 @@ if (path.value() == kDBusSystemObjectPath && signal->GetMember() == kNameOwnerChangedMember) { // Handle NameOwnerChanged separately - return HandleNameOwnerChanged(signal.Pass()); + return HandleNameOwnerChanged(std::move(signal)); } return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; }
diff --git a/dbus/test_service.cc b/dbus/test_service.cc index 804bb2a..a4e152a 100644 --- a/dbus/test_service.cc +++ b/dbus/test_service.cc
@@ -5,8 +5,8 @@ #include "dbus/test_service.h" #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -311,7 +311,7 @@ scoped_ptr<Response> response = Response::FromMethodCall(method_call); MessageWriter writer(response.get()); writer.AppendString(text_message); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::SlowEcho(MethodCall* method_call, @@ -352,7 +352,7 @@ AddPropertiesToWriter(&writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::GetProperty(MethodCall* method_call, @@ -378,7 +378,7 @@ writer.AppendVariantOfString("TestService"); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Version") { // Return a new value for the "Version" property: // Variant<20> @@ -387,7 +387,7 @@ writer.AppendVariantOfInt16(20); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Methods") { // Return the previous value for the "Methods" property: // Variant<["Echo", "SlowEcho", "AsyncEcho", "BrokenMethod"]> @@ -405,7 +405,7 @@ variant_writer.CloseContainer(&variant_array_writer); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Objects") { // Return the previous value for the "Objects" property: // Variant<[objectpath:"/TestObjectPath"]> @@ -420,7 +420,7 @@ variant_writer.CloseContainer(&variant_array_writer); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else if (name == "Bytes") { // Return the previous value for the "Bytes" property: // Variant<[0x54, 0x65, 0x73, 0x74]> @@ -434,7 +434,7 @@ variant_writer.AppendArrayOfBytes(bytes, sizeof(bytes)); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } else { // Return error. response_sender.Run(scoped_ptr<Response>()); @@ -505,14 +505,14 @@ } scoped_ptr<Response> response = Response::FromMethodCall(method_call); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::PerformActionResponse( MethodCall* method_call, ExportedObject::ResponseSender response_sender) { scoped_ptr<Response> response = Response::FromMethodCall(method_call); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void TestService::OwnershipReleased( @@ -572,7 +572,7 @@ array_writer.CloseContainer(&dict_entry_writer); writer.CloseContainer(&array_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); if (send_immediate_properties_changed_) SendPropertyChangedSignal("ChangedTestServiceName");
diff --git a/device/battery/battery_monitor_impl.cc b/device/battery/battery_monitor_impl.cc index b538394..8bb92db 100644 --- a/device/battery/battery_monitor_impl.cc +++ b/device/battery/battery_monitor_impl.cc
@@ -4,6 +4,8 @@ #include "device/battery/battery_monitor_impl.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" @@ -12,13 +14,12 @@ // static void BatteryMonitorImpl::Create( mojo::InterfaceRequest<BatteryMonitor> request) { - new BatteryMonitorImpl(request.Pass()); + new BatteryMonitorImpl(std::move(request)); } BatteryMonitorImpl::BatteryMonitorImpl( mojo::InterfaceRequest<BatteryMonitor> request) - : binding_(this, request.Pass()), - status_to_report_(false) { + : binding_(this, std::move(request)), status_to_report_(false) { // NOTE: DidChange may be called before AddCallback returns. This is done to // report current status. subscription_ = BatteryStatusService::GetInstance()->AddCallback(
diff --git a/device/battery/battery_status_manager_linux.cc b/device/battery/battery_status_manager_linux.cc index cf07f78..0f5cfc7f 100644 --- a/device/battery/battery_status_manager_linux.cc +++ b/device/battery/battery_status_manager_linux.cc
@@ -85,7 +85,7 @@ scoped_ptr<PathsVector> GetPowerSourcesPaths(dbus::ObjectProxy* proxy) { scoped_ptr<PathsVector> paths(new PathsVector()); if (!proxy) - return paths.Pass(); + return paths; dbus::MethodCall method_call(kUPowerServiceName, kUPowerEnumerateDevices); scoped_ptr<dbus::Response> response( @@ -96,7 +96,7 @@ dbus::MessageReader reader(response.get()); reader.PopArrayOfObjectPaths(paths.get()); } - return paths.Pass();; + return paths; } void UpdateNumberBatteriesHistogram(int count) {
diff --git a/device/battery/battery_status_service.cc b/device/battery/battery_status_service.cc index 453adb7..6b3c34c 100644 --- a/device/battery/battery_status_service.cc +++ b/device/battery/battery_status_service.cc
@@ -4,6 +4,8 @@ #include "device/battery/battery_status_service.h" +#include <utility> + #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "base/single_thread_task_runner.h" @@ -99,7 +101,7 @@ void BatteryStatusService::SetBatteryManagerForTesting( scoped_ptr<BatteryStatusManager> test_battery_manager) { - battery_fetcher_ = test_battery_manager.Pass(); + battery_fetcher_ = std::move(test_battery_manager); status_ = BatteryStatus(); status_updated_ = false; }
diff --git a/device/battery/battery_status_service_unittest.cc b/device/battery/battery_status_service_unittest.cc index c46b8061..45d137d 100644 --- a/device/battery/battery_status_service_unittest.cc +++ b/device/battery/battery_status_service_unittest.cc
@@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "device/battery/battery_status_service.h" + +#include <utility> + #include "base/bind.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "device/battery/battery_status_manager.h" -#include "device/battery/battery_status_service.h" #include "testing/gtest/include/gtest/gtest.h" namespace device { @@ -69,7 +72,7 @@ new FakeBatteryManager(battery_service_.GetUpdateCallbackForTesting())); battery_manager_ = battery_manager.get(); - battery_service_.SetBatteryManagerForTesting(battery_manager.Pass()); + battery_service_.SetBatteryManagerForTesting(std::move(battery_manager)); } void TearDown() override {
diff --git a/device/bluetooth/bluetooth_adapter.cc b/device/bluetooth/bluetooth_adapter.cc index 20f73d6..2f90428 100644 --- a/device/bluetooth/bluetooth_adapter.cc +++ b/device/bluetooth/bluetooth_adapter.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/bluetooth_adapter.h" +#include <utility> + #include "base/bind.h" #include "base/metrics/histogram_macros.h" #include "base/stl_util.h" @@ -168,9 +170,9 @@ scoped_ptr<BluetoothDiscoverySession> discovery_session( new BluetoothDiscoverySession(scoped_refptr<BluetoothAdapter>(this), - discovery_filter.Pass())); + std::move(discovery_filter))); discovery_sessions_.insert(discovery_session.get()); - callback.Run(discovery_session.Pass()); + callback.Run(std::move(discovery_session)); } void BluetoothAdapter::OnStartDiscoverySessionError( @@ -239,7 +241,7 @@ result = BluetoothDiscoveryFilter::Merge(result.get(), curr_filter); } - return result.Pass(); + return result; } // static
diff --git a/device/bluetooth/bluetooth_adapter_bluez.cc b/device/bluetooth/bluetooth_adapter_bluez.cc index 2e059f1..0997dd9 100644 --- a/device/bluetooth/bluetooth_adapter_bluez.cc +++ b/device/bluetooth/bluetooth_adapter_bluez.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/bluetooth_adapter_bluez.h" #include <string> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -345,7 +346,7 @@ const CreateAdvertisementCallback& callback, const CreateAdvertisementErrorCallback& error_callback) { scoped_refptr<BluetoothAdvertisementBlueZ> advertisement( - new BluetoothAdvertisementBlueZ(advertisement_data.Pass(), this)); + new BluetoothAdvertisementBlueZ(std::move(advertisement_data), this)); advertisement->Register(base::Bind(callback, advertisement), error_callback); } @@ -1198,7 +1199,7 @@ BluetoothDiscoveryFilter::Transport::TRANSPORT_DUAL)); df->CopyFrom(*discovery_filter); SetDiscoveryFilter( - df.Pass(), + std::move(df), base::Bind(&BluetoothAdapterBlueZ::OnPreSetDiscoveryFilter, weak_ptr_factory_.GetWeakPtr(), callback, error_callback), base::Bind(&BluetoothAdapterBlueZ::OnPreSetDiscoveryFilterError,
diff --git a/device/bluetooth/bluetooth_adapter_profile_bluez.cc b/device/bluetooth/bluetooth_adapter_profile_bluez.cc index 845002b..86b93c6 100644 --- a/device/bluetooth/bluetooth_adapter_profile_bluez.cc +++ b/device/bluetooth/bluetooth_adapter_profile_bluez.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/bluetooth_adapter_profile_bluez.h" #include <string> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -125,7 +126,7 @@ return; } - delegates_[delegate_path.value()]->NewConnection(device_path, fd.Pass(), + delegates_[delegate_path.value()]->NewConnection(device_path, std::move(fd), options, callback); }
diff --git a/device/bluetooth/bluetooth_adapter_unittest.cc b/device/bluetooth/bluetooth_adapter_unittest.cc index 9cff2e4..6bc24c3 100644 --- a/device/bluetooth/bluetooth_adapter_unittest.cc +++ b/device/bluetooth/bluetooth_adapter_unittest.cc
@@ -2,14 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "device/bluetooth/bluetooth_adapter.h" + #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/run_loop.h" #include "build/build_config.h" -#include "device/bluetooth/bluetooth_adapter.h" #include "device/bluetooth/bluetooth_device.h" #include "device/bluetooth/bluetooth_discovery_session.h" #include "device/bluetooth/test/bluetooth_test.h" @@ -61,7 +63,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter, const DiscoverySessionCallback& callback, const ErrorCallback& error_callback) override { - OnStartDiscoverySession(discovery_filter.Pass(), callback); + OnStartDiscoverySession(std::move(discovery_filter), callback); } void StartDiscoverySession(const DiscoverySessionCallback& callback, @@ -94,7 +96,7 @@ void TestOnStartDiscoverySession( scoped_ptr<device::BluetoothDiscoverySession> discovery_session) { - discovery_sessions_.push_back(discovery_session.Pass()); + discovery_sessions_.push_back(std::move(discovery_session)); } void CleanupSessions() { discovery_sessions_.clear(); } @@ -102,7 +104,7 @@ void InjectFilteredSession( scoped_ptr<device::BluetoothDiscoveryFilter> discovery_filter) { StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&TestBluetoothAdapter::TestOnStartDiscoverySession, base::Unretained(this)), base::Bind(&TestBluetoothAdapter::TestErrorCallback, @@ -226,7 +228,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter; // make sure adapter have one session wihout filtering. - adapter->InjectFilteredSession(discovery_filter.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter)); // having one reglar session should result in no filter scoped_ptr<BluetoothDiscoveryFilter> resulting_filter = @@ -257,7 +259,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2); // make sure adapter have one session wihout filtering. - adapter->InjectFilteredSession(discovery_filter.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter)); // DO_NOTHING should have no impact resulting_filter = adapter->GetMergedDiscoveryFilter(); @@ -269,7 +271,7 @@ resulting_filter->GetRSSI(&resulting_rssi); EXPECT_EQ(-30, resulting_rssi); - adapter->InjectFilteredSession(discovery_filter2.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter2)); // result of merging two rssi values should be lower one resulting_filter = adapter->GetMergedDiscoveryFilter(); @@ -293,7 +295,7 @@ // when rssi and pathloss are merged, both should be cleared, becuase there is // no way to tell which filter will be more generic - adapter->InjectFilteredSession(discovery_filter3.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter3)); resulting_filter = adapter->GetMergedDiscoveryFilter(); EXPECT_FALSE(resulting_filter->GetRSSI(&resulting_rssi)); EXPECT_FALSE(resulting_filter->GetPathloss(&resulting_pathloss)); @@ -313,14 +315,14 @@ BluetoothDiscoveryFilter::Transport::TRANSPORT_LE); scoped_ptr<BluetoothDiscoveryFilter> discovery_filter2(df2); - adapter->InjectFilteredSession(discovery_filter.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter)); // Just one filter, make sure transport was properly rewritten resulting_filter = adapter->GetMergedDiscoveryFilter(); EXPECT_EQ(BluetoothDiscoveryFilter::Transport::TRANSPORT_CLASSIC, resulting_filter->GetTransport()); - adapter->InjectFilteredSession(discovery_filter2.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter2)); // Two filters, should have OR of both transport's resulting_filter = adapter->GetMergedDiscoveryFilter(); @@ -344,7 +346,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3); // Merging empty filter in should result in empty filter - adapter->InjectFilteredSession(discovery_filter3.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter3)); resulting_filter = adapter->GetMergedDiscoveryFilter(); EXPECT_TRUE(resulting_filter->IsDefault()); @@ -379,9 +381,9 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3); // make sure adapter have one session wihout filtering. - adapter->InjectFilteredSession(discovery_filter.Pass()); - adapter->InjectFilteredSession(discovery_filter2.Pass()); - adapter->InjectFilteredSession(discovery_filter3.Pass()); + adapter->InjectFilteredSession(std::move(discovery_filter)); + adapter->InjectFilteredSession(std::move(discovery_filter2)); + adapter->InjectFilteredSession(std::move(discovery_filter3)); scoped_ptr<BluetoothDiscoveryFilter> resulting_filter = adapter->GetMergedDiscoveryFilter();
diff --git a/device/bluetooth/bluetooth_advertisement.h b/device/bluetooth/bluetooth_advertisement.h index 5dcc1f0..4f79519 100644 --- a/device/bluetooth/bluetooth_advertisement.h +++ b/device/bluetooth/bluetooth_advertisement.h
@@ -6,9 +6,9 @@ #define DEVICE_BLUETOOTH_BLUETOOTH_ADVERTISEMENT_H_ #include <stdint.h> - #include <map> #include <string> +#include <utility> #include <vector> #include "base/callback.h" @@ -60,24 +60,24 @@ ~Data(); AdvertisementType type() { return type_; } - scoped_ptr<UUIDList> service_uuids() { return service_uuids_.Pass(); } + scoped_ptr<UUIDList> service_uuids() { return std::move(service_uuids_); } scoped_ptr<ManufacturerData> manufacturer_data() { - return manufacturer_data_.Pass(); + return std::move(manufacturer_data_); } - scoped_ptr<UUIDList> solicit_uuids() { return solicit_uuids_.Pass(); } - scoped_ptr<ServiceData> service_data() { return service_data_.Pass(); } + scoped_ptr<UUIDList> solicit_uuids() { return std::move(solicit_uuids_); } + scoped_ptr<ServiceData> service_data() { return std::move(service_data_); } void set_service_uuids(scoped_ptr<UUIDList> service_uuids) { - service_uuids_ = service_uuids.Pass(); + service_uuids_ = std::move(service_uuids); } void set_manufacturer_data(scoped_ptr<ManufacturerData> manufacturer_data) { - manufacturer_data_ = manufacturer_data.Pass(); + manufacturer_data_ = std::move(manufacturer_data); } void set_solicit_uuids(scoped_ptr<UUIDList> solicit_uuids) { - solicit_uuids_ = solicit_uuids.Pass(); + solicit_uuids_ = std::move(solicit_uuids); } void set_service_data(scoped_ptr<ServiceData> service_data) { - service_data_ = service_data.Pass(); + service_data_ = std::move(service_data); } void set_include_tx_power(bool include_tx_power) {
diff --git a/device/bluetooth/bluetooth_advertisement_bluez.cc b/device/bluetooth/bluetooth_advertisement_bluez.cc index 97b78da..869692f 100644 --- a/device/bluetooth/bluetooth_advertisement_bluez.cc +++ b/device/bluetooth/bluetooth_advertisement_bluez.cc
@@ -89,8 +89,8 @@ static_cast< bluez::BluetoothLEAdvertisementServiceProvider::AdvertisementType>( data->type()), - data->service_uuids().Pass(), data->manufacturer_data().Pass(), - data->solicit_uuids().Pass(), data->service_data().Pass()); + data->service_uuids(), data->manufacturer_data(), data->solicit_uuids(), + data->service_data()); } void BluetoothAdvertisementBlueZ::Register(
diff --git a/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc b/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc index b3a67020..ea933fc 100644 --- a/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc +++ b/device/bluetooth/bluetooth_advertisement_bluez_unittest.cc
@@ -93,14 +93,14 @@ make_scoped_ptr(new BluetoothAdvertisement::Data( BluetoothAdvertisement::ADVERTISEMENT_TYPE_BROADCAST)); data->set_service_uuids( - make_scoped_ptr(new BluetoothAdvertisement::UUIDList()).Pass()); + make_scoped_ptr(new BluetoothAdvertisement::UUIDList())); data->set_manufacturer_data( - make_scoped_ptr(new BluetoothAdvertisement::ManufacturerData()).Pass()); + make_scoped_ptr(new BluetoothAdvertisement::ManufacturerData())); data->set_solicit_uuids( - make_scoped_ptr(new BluetoothAdvertisement::UUIDList()).Pass()); + make_scoped_ptr(new BluetoothAdvertisement::UUIDList())); data->set_service_data( - make_scoped_ptr(new BluetoothAdvertisement::ServiceData()).Pass()); - return data.Pass(); + make_scoped_ptr(new BluetoothAdvertisement::ServiceData())); + return data; } // Creates and registers an advertisement with the adapter. @@ -109,7 +109,7 @@ advertisement_ = nullptr; adapter_->RegisterAdvertisement( - CreateAdvertisementData().Pass(), + CreateAdvertisementData(), base::Bind(&BluetoothAdvertisementBlueZTest::RegisterCallback, base::Unretained(this)), base::Bind(&BluetoothAdvertisementBlueZTest::AdvertisementErrorCallback,
diff --git a/device/bluetooth/bluetooth_bluez_unittest.cc b/device/bluetooth/bluetooth_bluez_unittest.cc index 74287e0..309aec0 100644 --- a/device/bluetooth/bluetooth_bluez_unittest.cc +++ b/device/bluetooth/bluetooth_bluez_unittest.cc
@@ -4,6 +4,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" @@ -1408,7 +1409,7 @@ true, base::Bind(&BluetoothBlueZTest::Callback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1473,7 +1474,7 @@ fake_bluetooth_adapter_client_->MakeSetDiscoveryFilterFail(); adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1523,13 +1524,13 @@ // Queue two requests to start discovery session with filter. adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); adapter_->StartDiscoverySessionWithFilter( - discovery_filter2.Pass(), + std::move(discovery_filter2), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1620,13 +1621,13 @@ // Queue two requests to start discovery session with filter. adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); adapter_->StartDiscoverySessionWithFilter( - discovery_filter2.Pass(), + std::move(discovery_filter2), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1722,7 +1723,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter(df); discovery_sessions_[0]->SetDiscoveryFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::Callback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1801,7 +1802,7 @@ } adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -1925,7 +1926,7 @@ } adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -2007,7 +2008,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter(df); adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -2029,7 +2030,7 @@ discovery_filter = scoped_ptr<BluetoothDiscoveryFilter>(df); adapter_->StartDiscoverySessionWithFilter( - discovery_filter.Pass(), + std::move(discovery_filter), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this))); @@ -2053,7 +2054,7 @@ scoped_ptr<BluetoothDiscoveryFilter> discovery_filter3(df3); adapter_->StartDiscoverySessionWithFilter( - discovery_filter3.Pass(), + std::move(discovery_filter3), base::Bind(&BluetoothBlueZTest::DiscoverySessionCallback, base::Unretained(this)), base::Bind(&BluetoothBlueZTest::ErrorCallback, base::Unretained(this)));
diff --git a/device/bluetooth/bluetooth_device_bluez.cc b/device/bluetooth/bluetooth_device_bluez.cc index 97ba1d75..4ae3dde 100644 --- a/device/bluetooth/bluetooth_device_bluez.cc +++ b/device/bluetooth/bluetooth_device_bluez.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/bluetooth_device_bluez.h" #include <stdio.h> +#include <utility> #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -636,7 +637,7 @@ const GattConnectionCallback& callback) { scoped_ptr<device::BluetoothGattConnection> conn( new BluetoothGattConnectionBlueZ(adapter_, GetAddress(), object_path_)); - callback.Run(conn.Pass()); + callback.Run(std::move(conn)); } void BluetoothDeviceBlueZ::OnConnectError(
diff --git a/device/bluetooth/bluetooth_discovery_session.cc b/device/bluetooth/bluetooth_discovery_session.cc index 964b8c5..9db760d 100644 --- a/device/bluetooth/bluetooth_discovery_session.cc +++ b/device/bluetooth/bluetooth_discovery_session.cc
@@ -101,7 +101,7 @@ // BluetoothDiscoverySession::SetDiscoveryFilter is only used from a private // extension API, so we don't bother histogramming its failures. adapter_->SetDiscoveryFilter( - adapter_->GetMergedDiscoveryFilter().Pass(), callback, + adapter_->GetMergedDiscoveryFilter(), callback, base::Bind(&IgnoreDiscoveryOutcome, error_callback)); }
diff --git a/device/bluetooth/bluetooth_gatt_bluez_unittest.cc b/device/bluetooth/bluetooth_gatt_bluez_unittest.cc index 7dcfe27..575c867 100644 --- a/device/bluetooth/bluetooth_gatt_bluez_unittest.cc +++ b/device/bluetooth/bluetooth_gatt_bluez_unittest.cc
@@ -4,6 +4,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" @@ -138,7 +139,7 @@ void GattConnectionCallback(scoped_ptr<BluetoothGattConnection> conn) { ++success_callback_count_; - gatt_conn_ = conn.Pass(); + gatt_conn_ = std::move(conn); } void NotifySessionCallback(scoped_ptr<BluetoothGattNotifySession> session) {
diff --git a/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.cc b/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.cc index e76c57e4..07806f7 100644 --- a/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.cc +++ b/device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/bluetooth_remote_gatt_characteristic_bluez.h" #include <limits> +#include <utility> #include "base/logging.h" #include "base/strings/stringprintf.h" @@ -251,7 +252,7 @@ new BluetoothGattNotifySessionBlueZ( service_->GetAdapter(), service_->GetDevice()->GetAddress(), service_->GetIdentifier(), GetIdentifier(), object_path_)); - callback.Run(session.Pass()); + callback.Run(std::move(session)); return; } @@ -417,7 +418,7 @@ new BluetoothGattNotifySessionBlueZ( service_->GetAdapter(), service_->GetDevice()->GetAddress(), service_->GetIdentifier(), GetIdentifier(), object_path_)); - callback.Run(session.Pass()); + callback.Run(std::move(session)); ProcessStartNotifyQueue(); }
diff --git a/device/bluetooth/bluetooth_socket_bluez.cc b/device/bluetooth/bluetooth_socket_bluez.cc index df5a0c03..5a82ef1 100644 --- a/device/bluetooth/bluetooth_socket_bluez.cc +++ b/device/bluetooth/bluetooth_socket_bluez.cc
@@ -5,9 +5,9 @@ #include "device/bluetooth/bluetooth_socket_bluez.h" #include <stdint.h> - #include <queue> #include <string> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -368,7 +368,7 @@ } else { linked_ptr<ConnectionRequest> request(new ConnectionRequest()); request->device_path = device_path; - request->fd = fd.Pass(); + request->fd = std::move(fd); request->options = options; request->callback = callback;
diff --git a/device/bluetooth/bluetooth_socket_net.cc b/device/bluetooth/bluetooth_socket_net.cc index b042863b..de113f9 100644 --- a/device/bluetooth/bluetooth_socket_net.cc +++ b/device/bluetooth/bluetooth_socket_net.cc
@@ -6,6 +6,7 @@ #include <queue> #include <string> +#include <utility> #include "base/location.h" #include "base/logging.h" @@ -120,7 +121,7 @@ } void BluetoothSocketNet::SetTCPSocket(scoped_ptr<net::TCPSocket> tcp_socket) { - tcp_socket_ = tcp_socket.Pass(); + tcp_socket_ = std::move(tcp_socket); } void BluetoothSocketNet::PostSuccess(const base::Closure& callback) {
diff --git a/device/bluetooth/dbus/bluetooth_agent_service_provider.cc b/device/bluetooth/dbus/bluetooth_agent_service_provider.cc index 0592356..1bafcb0d 100644 --- a/device/bluetooth/dbus/bluetooth_agent_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_agent_service_provider.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/bluetooth_agent_service_provider.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" @@ -323,7 +325,7 @@ dbus::Response::FromMethodCall(method_call)); dbus::MessageWriter writer(response.get()); writer.AppendString(pincode); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); break; } case Delegate::REJECTED: { @@ -354,7 +356,7 @@ dbus::Response::FromMethodCall(method_call)); dbus::MessageWriter writer(response.get()); writer.AppendUint32(passkey); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); break; } case Delegate::REJECTED: {
diff --git a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.cc b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.cc index 6132fbf..bd578532 100644 --- a/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/dbus/bluetooth_gatt_characteristic_service_provider.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -141,7 +142,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ss'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -152,7 +153,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -190,7 +191,7 @@ "No such property: '" + property_name + "'."); } - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by dbus:: when the Bluetooth daemon sets a single property of the @@ -212,7 +213,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ssv'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -223,7 +224,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -242,7 +243,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, error_name, error_message); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -254,7 +255,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "Property '" + property_name + "' has type 'ay'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -286,7 +287,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 's'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -297,7 +298,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -363,7 +364,7 @@ writer.CloseContainer(&array_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by the Delegate in response to a successful method call to get the @@ -381,7 +382,7 @@ variant_writer.AppendArrayOfBytes(value.data(), value.size()); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by the Delegate in response to a successful method call to set the @@ -401,7 +402,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorFailed, "Failed to get/set characteristic value."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); } // Origin thread (i.e. the UI thread in production).
diff --git a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc index 36ae7ef..53cc7f1 100644 --- a/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/dbus/bluetooth_gatt_descriptor_service_provider.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -139,7 +140,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ss'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -150,7 +151,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -188,7 +189,7 @@ "No such property: '" + property_name + "'."); } - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by dbus:: when the Bluetooth daemon sets a single property of the @@ -210,7 +211,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ssv'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -221,7 +222,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -240,7 +241,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, error_name, error_message); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -252,7 +253,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "Property '" + property_name + "' has type 'ay'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -283,7 +284,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 's'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -294,7 +295,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -358,7 +359,7 @@ writer.CloseContainer(&array_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by the Delegate in response to a successful method call to get the @@ -376,7 +377,7 @@ variant_writer.AppendArrayOfBytes(value.data(), value.size()); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by the Delegate in response to a successful method call to set the @@ -395,7 +396,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall( method_call, kErrorFailed, "Failed to get/set descriptor value."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); } // Origin thread (i.e. the UI thread in production).
diff --git a/device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc b/device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc index c0e5ddb..c30587f 100644 --- a/device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_gatt_service_service_provider.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/bluetooth_gatt_service_service_provider.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" @@ -96,7 +98,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ss'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -107,7 +109,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -118,7 +120,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such property: '" + property_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -137,7 +139,7 @@ writer.CloseContainer(&variant_writer); } - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by dbus:: when the Bluetooth daemon sets a single property of the @@ -153,7 +155,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorPropertyReadOnly, "All properties are read-only."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); } // Called by dbus:: when the Bluetooth daemon fetches all properties of the @@ -171,7 +173,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 's'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -182,7 +184,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -209,7 +211,7 @@ writer.CloseContainer(&array_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by dbus:: when a method is exported.
diff --git a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc index e5c5e358..b5e6f81 100644 --- a/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/bluetooth_le_advertisement_service_provider.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" @@ -38,10 +40,10 @@ bus_(bus), delegate_(delegate), type_(type), - service_uuids_(service_uuids.Pass()), - manufacturer_data_(manufacturer_data.Pass()), - solicit_uuids_(solicit_uuids.Pass()), - service_data_(service_data.Pass()), + service_uuids_(std::move(service_uuids)), + manufacturer_data_(std::move(manufacturer_data)), + solicit_uuids_(std::move(solicit_uuids)), + service_data_(std::move(service_data)), weak_ptr_factory_(this) { DCHECK(bus); DCHECK(delegate); @@ -116,7 +118,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 'ss'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -127,7 +129,7 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -168,11 +170,11 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such property: '" + property_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); } writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Called by dbus:: when the Bluetooth daemon fetches all properties of the @@ -190,7 +192,7 @@ scoped_ptr<dbus::ErrorResponse> error_response = dbus::ErrorResponse::FromMethodCall(method_call, kErrorInvalidArgs, "Expected 's'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } @@ -201,11 +203,11 @@ dbus::ErrorResponse::FromMethodCall( method_call, kErrorInvalidArgs, "No such interface: '" + interface_name + "'."); - response_sender.Run(error_response.Pass()); + response_sender.Run(std::move(error_response)); return; } - response_sender.Run(CreateGetAllResponse(method_call).Pass()); + response_sender.Run(CreateGetAllResponse(method_call)); } // Called by dbus:: when a method is exported. @@ -255,7 +257,7 @@ variant_writer.AppendArrayOfBytes(value.data(), value.size()); writer.CloseContainer(&variant_writer); - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } void AppendArrayVariantOfStrings(dbus::MessageWriter* dict_writer, @@ -413,8 +415,9 @@ scoped_ptr<ServiceData> service_data) { if (!bluez::BluezDBusManager::Get()->IsUsingStub()) { return make_scoped_ptr(new BluetoothAdvertisementServiceProviderImpl( - bus, object_path, delegate, type, service_uuids.Pass(), - manufacturer_data.Pass(), solicit_uuids.Pass(), service_data.Pass())); + bus, object_path, delegate, type, std::move(service_uuids), + std::move(manufacturer_data), std::move(solicit_uuids), + std::move(service_data))); } else { return make_scoped_ptr( new FakeBluetoothLEAdvertisementServiceProvider(object_path, delegate));
diff --git a/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.cc b/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.cc index 9c7a4081..5a0d17fc 100644 --- a/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.cc
@@ -5,6 +5,7 @@ #include "device/bluetooth/dbus/bluetooth_media_endpoint_service_provider.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/logging.h" @@ -255,7 +256,7 @@ } else { writer.AppendArrayOfBytes(&configuration[0], configuration.size()); } - response_sender.Run(response.Pass()); + response_sender.Run(std::move(response)); } // Origin thread (i.e. the UI thread in production).
diff --git a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc index 1555d51..4d2845d 100644 --- a/device/bluetooth/dbus/bluetooth_profile_service_provider.cc +++ b/device/bluetooth/dbus/bluetooth_profile_service_provider.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/bluetooth_profile_service_provider.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" #include "base/macros.h" @@ -130,7 +132,7 @@ &BluetoothProfileServiceProviderImpl::OnConfirmation, weak_ptr_factory_.GetWeakPtr(), method_call, response_sender); - delegate_->NewConnection(device_path, fd.Pass(), options, callback); + delegate_->NewConnection(device_path, std::move(fd), options, callback); } // Called by dbus:: when the Bluetooth daemon is about to disconnect the
diff --git a/device/bluetooth/dbus/bluez_dbus_manager.cc b/device/bluetooth/dbus/bluez_dbus_manager.cc index 376261d..9736f67 100644 --- a/device/bluetooth/dbus/bluez_dbus_manager.cc +++ b/device/bluetooth/dbus/bluez_dbus_manager.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/bluez_dbus_manager.h" +#include <utility> + #include "base/command_line.h" #include "base/sys_info.h" #include "base/threading/thread.h" @@ -30,7 +32,7 @@ BluezDBusManager::BluezDBusManager( dbus::Bus* bus, scoped_ptr<BluetoothDBusClientBundle> client_bundle) - : bus_(bus), client_bundle_(client_bundle.Pass()) {} + : bus_(bus), client_bundle_(std::move(client_bundle)) {} BluezDBusManager::~BluezDBusManager() { // Delete all D-Bus clients before shutting down the system bus. @@ -177,74 +179,75 @@ void BluezDBusManagerSetter::SetBluetoothAdapterClient( scoped_ptr<BluetoothAdapterClient> client) { bluez::BluezDBusManager::Get()->client_bundle_->bluetooth_adapter_client_ = - client.Pass(); + std::move(client); } void BluezDBusManagerSetter::SetBluetoothLEAdvertisingManagerClient( scoped_ptr<BluetoothLEAdvertisingManagerClient> client) { bluez::BluezDBusManager::Get() ->client_bundle_->bluetooth_le_advertising_manager_client_ = - client.Pass(); + std::move(client); } void BluezDBusManagerSetter::SetBluetoothAgentManagerClient( scoped_ptr<BluetoothAgentManagerClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_agent_manager_client_ = client.Pass(); + ->client_bundle_->bluetooth_agent_manager_client_ = std::move(client); } void BluezDBusManagerSetter::SetBluetoothDeviceClient( scoped_ptr<BluetoothDeviceClient> client) { bluez::BluezDBusManager::Get()->client_bundle_->bluetooth_device_client_ = - client.Pass(); + std::move(client); } void BluezDBusManagerSetter::SetBluetoothGattCharacteristicClient( scoped_ptr<BluetoothGattCharacteristicClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_gatt_characteristic_client_ = client.Pass(); + ->client_bundle_->bluetooth_gatt_characteristic_client_ = + std::move(client); } void BluezDBusManagerSetter::SetBluetoothGattDescriptorClient( scoped_ptr<BluetoothGattDescriptorClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_gatt_descriptor_client_ = client.Pass(); + ->client_bundle_->bluetooth_gatt_descriptor_client_ = std::move(client); } void BluezDBusManagerSetter::SetBluetoothGattManagerClient( scoped_ptr<BluetoothGattManagerClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_gatt_manager_client_ = client.Pass(); + ->client_bundle_->bluetooth_gatt_manager_client_ = std::move(client); } void BluezDBusManagerSetter::SetBluetoothGattServiceClient( scoped_ptr<BluetoothGattServiceClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_gatt_service_client_ = client.Pass(); + ->client_bundle_->bluetooth_gatt_service_client_ = std::move(client); } void BluezDBusManagerSetter::SetBluetoothInputClient( scoped_ptr<BluetoothInputClient> client) { bluez::BluezDBusManager::Get()->client_bundle_->bluetooth_input_client_ = - client.Pass(); + std::move(client); } void BluezDBusManagerSetter::SetBluetoothMediaClient( scoped_ptr<BluetoothMediaClient> client) { bluez::BluezDBusManager::Get()->client_bundle_->bluetooth_media_client_ = - client.Pass(); + std::move(client); } void BluezDBusManagerSetter::SetBluetoothMediaTransportClient( scoped_ptr<BluetoothMediaTransportClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_media_transport_client_ = client.Pass(); + ->client_bundle_->bluetooth_media_transport_client_ = std::move(client); } void BluezDBusManagerSetter::SetBluetoothProfileManagerClient( scoped_ptr<BluetoothProfileManagerClient> client) { bluez::BluezDBusManager::Get() - ->client_bundle_->bluetooth_profile_manager_client_ = client.Pass(); + ->client_bundle_->bluetooth_profile_manager_client_ = std::move(client); } } // namespace bluez
diff --git a/device/bluetooth/dbus/fake_bluetooth_device_client.cc b/device/bluetooth/dbus/fake_bluetooth_device_client.cc index efcba2c..9e3e6bc 100644 --- a/device/bluetooth/dbus/fake_bluetooth_device_client.cc +++ b/device/bluetooth/dbus/fake_bluetooth_device_client.cc
@@ -479,7 +479,7 @@ BluetoothProfileServiceProvider::Delegate::Options options; profile_service_provider->NewConnection( - object_path, fd.Pass(), options, + object_path, std::move(fd), options, base::Bind(&FakeBluetoothDeviceClient::ConnectionCallback, base::Unretained(this), object_path, callback, error_callback)); @@ -763,7 +763,7 @@ pairedDevice->SetBoolean("isTrusted", true); pairedDevice->SetBoolean("paired", true); pairedDevice->SetBoolean("incoming", false); - predefined_devices->Append(pairedDevice.Pass()); + predefined_devices->Append(std::move(pairedDevice)); scoped_ptr<base::DictionaryValue> legacyDevice(new base::DictionaryValue); legacyDevice->SetString("path", kLegacyAutopairPath); @@ -778,7 +778,7 @@ legacyDevice->SetBoolean("discoverable", false); legacyDevice->SetBoolean("paired", false); legacyDevice->SetBoolean("incoming", false); - predefined_devices->Append(legacyDevice.Pass()); + predefined_devices->Append(std::move(legacyDevice)); scoped_ptr<base::DictionaryValue> pin(new base::DictionaryValue); pin->SetString("path", kDisplayPinCodePath); @@ -793,7 +793,7 @@ pin->SetBoolean("discoverable", false); pin->SetBoolean("paired", false); pin->SetBoolean("incoming", false); - predefined_devices->Append(pin.Pass()); + predefined_devices->Append(std::move(pin)); scoped_ptr<base::DictionaryValue> vanishing(new base::DictionaryValue); vanishing->SetString("path", kVanishingDevicePath); @@ -808,7 +808,7 @@ vanishing->SetBoolean("discoverable", false); vanishing->SetBoolean("paired", false); vanishing->SetBoolean("incoming", false); - predefined_devices->Append(vanishing.Pass()); + predefined_devices->Append(std::move(vanishing)); scoped_ptr<base::DictionaryValue> connect_unpairable( new base::DictionaryValue); @@ -824,7 +824,7 @@ connect_unpairable->SetBoolean("discoverable", false); connect_unpairable->SetBoolean("paired", false); connect_unpairable->SetBoolean("incoming", false); - predefined_devices->Append(connect_unpairable.Pass()); + predefined_devices->Append(std::move(connect_unpairable)); scoped_ptr<base::DictionaryValue> passkey(new base::DictionaryValue); passkey->SetString("path", kDisplayPasskeyPath); @@ -839,7 +839,7 @@ passkey->SetBoolean("discoverable", false); passkey->SetBoolean("paired", false); passkey->SetBoolean("incoming", false); - predefined_devices->Append(passkey.Pass()); + predefined_devices->Append(std::move(passkey)); scoped_ptr<base::DictionaryValue> request_pin(new base::DictionaryValue); request_pin->SetString("path", kRequestPinCodePath); @@ -854,7 +854,7 @@ request_pin->SetBoolean("discoverable", false); request_pin->SetBoolean("paired", false); request_pin->SetBoolean("incoming", false); - predefined_devices->Append(request_pin.Pass()); + predefined_devices->Append(std::move(request_pin)); scoped_ptr<base::DictionaryValue> confirm(new base::DictionaryValue); confirm->SetString("path", kConfirmPasskeyPath); @@ -869,7 +869,7 @@ confirm->SetBoolean("discoverable", false); confirm->SetBoolean("paired", false); confirm->SetBoolean("incoming", false); - predefined_devices->Append(confirm.Pass()); + predefined_devices->Append(std::move(confirm)); scoped_ptr<base::DictionaryValue> request_passkey(new base::DictionaryValue); request_passkey->SetString("path", kRequestPasskeyPath); @@ -884,7 +884,7 @@ request_passkey->SetBoolean("discoverable", false); request_passkey->SetBoolean("paired", false); request_passkey->SetBoolean("incoming", false); - predefined_devices->Append(request_passkey.Pass()); + predefined_devices->Append(std::move(request_passkey)); scoped_ptr<base::DictionaryValue> unconnectable(new base::DictionaryValue); unconnectable->SetString("path", kUnconnectableDevicePath); @@ -899,7 +899,7 @@ unconnectable->SetBoolean("discoverable", false); unconnectable->SetBoolean("paired", false); unconnectable->SetBoolean("incoming", false); - predefined_devices->Append(unconnectable.Pass()); + predefined_devices->Append(std::move(unconnectable)); scoped_ptr<base::DictionaryValue> unpairable(new base::DictionaryValue); unpairable->SetString("path", kUnpairableDevicePath); @@ -914,7 +914,7 @@ unpairable->SetBoolean("discoverable", false); unpairable->SetBoolean("paired", false); unpairable->SetBoolean("incoming", false); - predefined_devices->Append(unpairable.Pass()); + predefined_devices->Append(std::move(unpairable)); scoped_ptr<base::DictionaryValue> just_works(new base::DictionaryValue); just_works->SetString("path", kJustWorksPath); @@ -929,7 +929,7 @@ just_works->SetBoolean("discoverable", false); just_works->SetBoolean("paired", false); just_works->SetBoolean("incoming", false); - predefined_devices->Append(just_works.Pass()); + predefined_devices->Append(std::move(just_works)); scoped_ptr<base::DictionaryValue> low_energy(new base::DictionaryValue); low_energy->SetString("path", kLowEnergyPath); @@ -944,7 +944,7 @@ low_energy->SetBoolean("discoverable", false); low_energy->SetBoolean("paireed", false); low_energy->SetBoolean("incoming", false); - predefined_devices->Append(low_energy.Pass()); + predefined_devices->Append(std::move(low_energy)); scoped_ptr<base::DictionaryValue> paired_unconnectable( new base::DictionaryValue); @@ -961,7 +961,7 @@ paired_unconnectable->SetBoolean("discoverable", true); paired_unconnectable->SetBoolean("paired", true); paired_unconnectable->SetBoolean("incoming", false); - predefined_devices->Append(paired_unconnectable.Pass()); + predefined_devices->Append(std::move(paired_unconnectable)); scoped_ptr<base::DictionaryValue> connected_trusted_not_paired( new base::DictionaryValue); @@ -982,9 +982,9 @@ connected_trusted_not_paired->SetBoolean("discoverable", true); connected_trusted_not_paired->SetBoolean("paired", false); connected_trusted_not_paired->SetBoolean("incoming", false); - predefined_devices->Append(connected_trusted_not_paired.Pass()); + predefined_devices->Append(std::move(connected_trusted_not_paired)); - return predefined_devices.Pass(); + return predefined_devices; } void FakeBluetoothDeviceClient::RemoveDevice(
diff --git a/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.cc b/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.cc index 1089501..905a3af 100644 --- a/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.cc +++ b/device/bluetooth/dbus/fake_bluetooth_profile_service_provider.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/dbus/fake_bluetooth_profile_service_provider.h" +#include <utility> + #include "device/bluetooth/dbus/bluez_dbus_manager.h" #include "device/bluetooth/dbus/fake_bluetooth_profile_manager_client.h" @@ -42,7 +44,7 @@ const Delegate::ConfirmationCallback& callback) { VLOG(1) << object_path_.value() << ": NewConnection for " << device_path.value(); - delegate_->NewConnection(device_path, fd.Pass(), options, callback); + delegate_->NewConnection(device_path, std::move(fd), options, callback); } void FakeBluetoothProfileServiceProvider::RequestDisconnection(
diff --git a/device/bluetooth/test/mock_bluetooth_adapter.cc b/device/bluetooth/test/mock_bluetooth_adapter.cc index f2d7b2a..6972732 100644 --- a/device/bluetooth/test/mock_bluetooth_adapter.cc +++ b/device/bluetooth/test/mock_bluetooth_adapter.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/test/mock_bluetooth_adapter.h" +#include <utility> + #include "build/build_config.h" #include "device/bluetooth/test/mock_bluetooth_advertisement.h" @@ -60,7 +62,7 @@ void MockBluetoothAdapter::AddMockDevice( scoped_ptr<MockBluetoothDevice> mock_device) { - mock_devices_.push_back(mock_device.Pass()); + mock_devices_.push_back(std::move(mock_device)); } BluetoothAdapter::ConstDeviceList MockBluetoothAdapter::GetConstMockDevices() {
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc index 230badaa..973b62ad 100644 --- a/device/bluetooth/test/mock_bluetooth_device.cc +++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/test/mock_bluetooth_device.h" +#include <utility> + #include "base/strings/utf_string_conversions.h" #include "device/bluetooth/bluetooth_gatt_service.h" #include "device/bluetooth/test/mock_bluetooth_adapter.h" @@ -62,7 +64,7 @@ void MockBluetoothDevice::AddMockService( scoped_ptr<MockBluetoothGattService> mock_service) { - mock_services_.push_back(mock_service.Pass()); + mock_services_.push_back(std::move(mock_service)); } std::vector<BluetoothGattService*> MockBluetoothDevice::GetMockServices()
diff --git a/device/bluetooth/test/mock_bluetooth_gatt_service.cc b/device/bluetooth/test/mock_bluetooth_gatt_service.cc index 93cbfc57..148208a 100644 --- a/device/bluetooth/test/mock_bluetooth_gatt_service.cc +++ b/device/bluetooth/test/mock_bluetooth_gatt_service.cc
@@ -4,6 +4,8 @@ #include "device/bluetooth/test/mock_bluetooth_gatt_service.h" +#include <utility> + #include "device/bluetooth/test/mock_bluetooth_device.h" using testing::Return; @@ -35,7 +37,7 @@ void MockBluetoothGattService::AddMockCharacteristic( scoped_ptr<MockBluetoothGattCharacteristic> mock_characteristic) { - mock_characteristics_.push_back(mock_characteristic.Pass()); + mock_characteristics_.push_back(std::move(mock_characteristic)); } std::vector<BluetoothGattCharacteristic*>
diff --git a/device/devices_app/devices_app.cc b/device/devices_app/devices_app.cc index 67675847..7c392ad 100644 --- a/device/devices_app/devices_app.cc +++ b/device/devices_app/devices_app.cc
@@ -5,6 +5,7 @@ #include "device/devices_app/devices_app.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -105,8 +106,8 @@ connection->ConnectToService(&permission_provider); // Owned by its message pipe. - usb::DeviceManagerImpl* device_manager = - new usb::DeviceManagerImpl(permission_provider.Pass(), request.Pass()); + usb::DeviceManagerImpl* device_manager = new usb::DeviceManagerImpl( + std::move(permission_provider), std::move(request)); device_manager->set_connection_error_handler( base::Bind(&DevicesApp::OnConnectionError, base::Unretained(this)));
diff --git a/device/devices_app/usb/device_impl.cc b/device/devices_app/usb/device_impl.cc index c8268e6..bc1cf17 100644 --- a/device/devices_app/usb/device_impl.cc +++ b/device/devices_app/usb/device_impl.cc
@@ -5,6 +5,7 @@ #include "device/devices_app/usb/device_impl.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -74,7 +75,7 @@ std::copy(buffer->data(), buffer->data() + buffer_size, bytes.begin()); data.Swap(&bytes); } - callback->Run(mojo::ConvertTo<TransferStatus>(status), data.Pass()); + callback->Run(mojo::ConvertTo<TransferStatus>(status), std::move(data)); } void OnControlTransferInPermissionCheckComplete( @@ -94,7 +95,7 @@ base::Bind(&OnTransferIn, base::Passed(&callback))); } else { mojo::Array<uint8_t> data; - callback->Run(TRANSFER_STATUS_PERMISSION_DENIED, data.Pass()); + callback->Run(TRANSFER_STATUS_PERMISSION_DENIED, std::move(data)); } } @@ -144,7 +145,7 @@ packets[i].Swap(&bytes); } } - callback->Run(mojo::ConvertTo<TransferStatus>(status), packets.Pass()); + callback->Run(mojo::ConvertTo<TransferStatus>(status), std::move(packets)); } void OnIsochronousTransferOut( @@ -160,9 +161,9 @@ DeviceImpl::DeviceImpl(scoped_refptr<UsbDevice> device, PermissionProviderPtr permission_provider, mojo::InterfaceRequest<Device> request) - : binding_(this, request.Pass()), + : binding_(this, std::move(request)), device_(device), - permission_provider_(permission_provider.Pass()), + permission_provider_(std::move(permission_provider)), weak_factory_(this) { // This object owns itself and will be destroyed if either the message pipe // it is bound to is closed or the PermissionProvider it depends on is
diff --git a/device/devices_app/usb/device_impl_unittest.cc b/device/devices_app/usb/device_impl_unittest.cc index 15ece7c..3fbc702 100644 --- a/device/devices_app/usb/device_impl_unittest.cc +++ b/device/devices_app/usb/device_impl_unittest.cc
@@ -2,12 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "device/devices_app/usb/device_impl.h" + #include <stddef.h> #include <stdint.h> - #include <map> #include <queue> #include <set> +#include <utility> #include <vector> #include "base/bind.h" @@ -15,7 +17,6 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/stl_util.h" -#include "device/devices_app/usb/device_impl.h" #include "device/devices_app/usb/fake_permission_provider.h" #include "device/usb/mock_usb_device.h" #include "device/usb/mock_usb_device_handle.h" @@ -157,7 +158,7 @@ PermissionProviderPtr permission_provider; permission_provider_.Bind(mojo::GetProxy(&permission_provider)); DevicePtr proxy; - new DeviceImpl(mock_device_, permission_provider.Pass(), + new DeviceImpl(mock_device_, std::move(permission_provider), mojo::GetProxy(&proxy)); // Set up mock handle calls to respond based on mock device configs @@ -187,7 +188,7 @@ ON_CALL(mock_handle(), IsochronousTransfer(_, _, _, _, _, _, _, _)) .WillByDefault(Invoke(this, &USBDeviceImplTest::IsochronousTransfer)); - return proxy.Pass(); + return proxy; } DevicePtr GetMockDeviceProxy() { @@ -662,7 +663,7 @@ params->index = 7; base::RunLoop loop; device->ControlTransferIn( - params.Pass(), static_cast<uint32_t>(fake_data.size()), 0, + std::move(params), static_cast<uint32_t>(fake_data.size()), 0, base::Bind(&ExpectTransferInAndThen, TRANSFER_STATUS_COMPLETED, fake_data, loop.QuitClosure())); loop.Run(); @@ -684,7 +685,7 @@ params->index = 7; base::RunLoop loop; device->ControlTransferOut( - params.Pass(), mojo::Array<uint8_t>::From(fake_data), 0, + std::move(params), mojo::Array<uint8_t>::From(fake_data), 0, base::Bind(&ExpectTransferStatusAndThen, TRANSFER_STATUS_COMPLETED, loop.QuitClosure())); loop.Run(); @@ -785,7 +786,7 @@ packets[i].Swap(&bytes); } device->IsochronousTransferOut( - 1, packets.Pass(), 0, + 1, std::move(packets), 0, base::Bind(&ExpectTransferStatusAndThen, TRANSFER_STATUS_COMPLETED, loop.QuitClosure())); loop.Run();
diff --git a/device/devices_app/usb/device_manager_impl.cc b/device/devices_app/usb/device_manager_impl.cc index 02b6bdd..b3f7784 100644 --- a/device/devices_app/usb/device_manager_impl.cc +++ b/device/devices_app/usb/device_manager_impl.cc
@@ -5,6 +5,7 @@ #include "device/devices_app/usb/device_manager_impl.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -39,7 +40,7 @@ allowed_devices[i] = DeviceInfo::From(*it->second); } - callback.Run(allowed_devices.Pass()); + callback.Run(std::move(allowed_devices)); } } // namespace @@ -48,15 +49,15 @@ void DeviceManagerImpl::Create(PermissionProviderPtr permission_provider, mojo::InterfaceRequest<DeviceManager> request) { // The created object is owned by its binding. - new DeviceManagerImpl(permission_provider.Pass(), request.Pass()); + new DeviceManagerImpl(std::move(permission_provider), std::move(request)); } DeviceManagerImpl::DeviceManagerImpl( PermissionProviderPtr permission_provider, mojo::InterfaceRequest<DeviceManager> request) - : permission_provider_(permission_provider.Pass()), + : permission_provider_(std::move(permission_provider)), observer_(this), - binding_(this, request.Pass()), + binding_(this, std::move(request)), weak_factory_(this) { // This object owns itself and will be destroyed if either the message pipe // it is bound to is closed or the PermissionProvider it depends on is @@ -78,7 +79,7 @@ const GetDevicesCallback& callback) { if (!usb_service_) { mojo::Array<DeviceInfoPtr> no_devices; - callback.Run(no_devices.Pass()); + callback.Run(std::move(no_devices)); return; } @@ -106,7 +107,7 @@ mojo::Array<DeviceInfoPtr> requested_devices(1); requested_devices[0] = DeviceInfo::From(*device); permission_provider_->HasDevicePermission( - requested_devices.Pass(), + std::move(requested_devices), base::Bind(&DeviceManagerImpl::OnGetDevicePermissionCheckComplete, base::Unretained(this), device, base::Passed(&device_request))); @@ -122,7 +123,8 @@ DCHECK(allowed_guids.size() == 1); PermissionProviderPtr permission_provider; permission_provider_->Bind(mojo::GetProxy(&permission_provider)); - new DeviceImpl(device, permission_provider.Pass(), device_request.Pass()); + new DeviceImpl(device, std::move(permission_provider), + std::move(device_request)); } void DeviceManagerImpl::OnGetDevices(EnumerationOptionsPtr options, @@ -142,7 +144,7 @@ } permission_provider_->HasDevicePermission( - requested_devices.Pass(), + std::move(requested_devices), base::Bind(&FilterAndConvertDevicesAndThen, device_map, callback)); } @@ -182,7 +184,7 @@ permission_request_pending_ = true; permission_provider_->HasDevicePermission( - requested_devices.Pass(), + std::move(requested_devices), base::Bind(&DeviceManagerImpl::OnEnumerationPermissionCheckComplete, base::Unretained(this), devices_added, devices_removed)); } @@ -214,7 +216,7 @@ DCHECK(!device_change_callbacks_.empty()); const GetDeviceChangesCallback& callback = device_change_callbacks_.front(); - callback.Run(notification.Pass()); + callback.Run(std::move(notification)); device_change_callbacks_.pop(); }
diff --git a/device/devices_app/usb/device_manager_impl_unittest.cc b/device/devices_app/usb/device_manager_impl_unittest.cc index c7f5f85d..720c811 100644 --- a/device/devices_app/usb/device_manager_impl_unittest.cc +++ b/device/devices_app/usb/device_manager_impl_unittest.cc
@@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <stddef.h> +#include "device/devices_app/usb/device_manager_impl.h" +#include <stddef.h> #include <set> #include <string> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -15,7 +17,6 @@ #include "base/thread_task_runner_handle.h" #include "device/core/mock_device_client.h" #include "device/devices_app/usb/device_impl.h" -#include "device/devices_app/usb/device_manager_impl.h" #include "device/devices_app/usb/fake_permission_provider.h" #include "device/usb/mock_usb_device.h" #include "device/usb/mock_usb_device_handle.h" @@ -40,9 +41,9 @@ PermissionProviderPtr permission_provider; permission_provider_.Bind(mojo::GetProxy(&permission_provider)); DeviceManagerPtr device_manager; - DeviceManagerImpl::Create(permission_provider.Pass(), + DeviceManagerImpl::Create(std::move(permission_provider), mojo::GetProxy(&device_manager)); - return device_manager.Pass(); + return device_manager; } MockDeviceClient device_client_; @@ -120,7 +121,7 @@ base::RunLoop loop; device_manager->GetDevices( - options.Pass(), + std::move(options), base::Bind(&ExpectDevicesAndThen, guids, loop.QuitClosure())); loop.Run(); }
diff --git a/device/devices_app/usb/fake_permission_provider.cc b/device/devices_app/usb/fake_permission_provider.cc index b660b27..3a774a8 100644 --- a/device/devices_app/usb/fake_permission_provider.cc +++ b/device/devices_app/usb/fake_permission_provider.cc
@@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <stddef.h> - #include "device/devices_app/usb/fake_permission_provider.h" +#include <stddef.h> +#include <utility> + namespace device { namespace usb { @@ -19,7 +20,7 @@ mojo::Array<mojo::String> allowed_guids(requested_devices.size()); for (size_t i = 0; i < requested_devices.size(); ++i) allowed_guids[i] = requested_devices[i]->guid; - callback.Run(allowed_guids.Pass()); + callback.Run(std::move(allowed_guids)); } void FakePermissionProvider::HasConfigurationPermission( @@ -38,7 +39,7 @@ void FakePermissionProvider::Bind( mojo::InterfaceRequest<PermissionProvider> request) { - bindings_.AddBinding(this, request.Pass()); + bindings_.AddBinding(this, std::move(request)); } } // namespace usb
diff --git a/device/devices_app/usb/type_converters.cc b/device/devices_app/usb/type_converters.cc index cc6852b4..7152d450 100644 --- a/device/devices_app/usb/type_converters.cc +++ b/device/devices_app/usb/type_converters.cc
@@ -143,7 +143,7 @@ ConvertTo<device::usb::TransferDirection>(endpoint.direction); info->type = ConvertTo<device::usb::EndpointType>(endpoint.transfer_type); info->packet_size = static_cast<uint32_t>(endpoint.maximum_packet_size); - return info.Pass(); + return info; } // static @@ -165,7 +165,7 @@ info->endpoints.push_back(device::usb::EndpointInfo::From(endpoint)); } - return info.Pass(); + return info; } // static @@ -187,12 +187,12 @@ auto info = device::usb::InterfaceInfo::New(); iter = interface_map.insert(std::make_pair(interfaces[i].interface_number, info.get())).first; - infos.push_back(info.Pass()); + infos.push_back(std::move(info)); } - iter->second->alternates.push_back(alternate.Pass()); + iter->second->alternates.push_back(std::move(alternate)); } - return infos.Pass(); + return infos; } // static @@ -204,7 +204,7 @@ info->configuration_value = config.configuration_value; info->interfaces = mojo::Array<device::usb::InterfaceInfoPtr>::From(config.interfaces); - return info.Pass(); + return info; } // static @@ -216,7 +216,7 @@ device::usb::WebUsbFunctionSubset::New(); info->first_interface = function.first_interface; info->origins = mojo::Array<mojo::String>::From(function.origins); - return info.Pass(); + return info; } // static @@ -230,7 +230,7 @@ info->origins = mojo::Array<mojo::String>::From(config.origins); info->functions = mojo::Array<device::usb::WebUsbFunctionSubsetPtr>::From(config.functions); - return info.Pass(); + return info; } // static @@ -244,7 +244,7 @@ info->configurations = mojo::Array<device::usb::WebUsbConfigurationSubsetPtr>::From( set.configurations); - return info.Pass(); + return info; } // static @@ -264,7 +264,7 @@ info->webusb_allowed_origins = device::usb::WebUsbDescriptorSet::From( *device.webusb_allowed_origins()); } - return info.Pass(); + return info; } } // namespace mojo
diff --git a/device/hid/device_monitor_linux.cc b/device/hid/device_monitor_linux.cc index 5dffc85..da78ca5 100644 --- a/device/hid/device_monitor_linux.cc +++ b/device/hid/device_monitor_linux.cc
@@ -89,7 +89,7 @@ DCHECK(thread_checker_.CalledOnValidThread()); ScopedUdevDevicePtr device( udev_device_new_from_syspath(udev_.get(), path.c_str())); - return device.Pass(); + return device; } void DeviceMonitorLinux::Enumerate(const EnumerateCallback& callback) {
diff --git a/device/hid/hid_connection_linux.cc b/device/hid/hid_connection_linux.cc index a2a4ebc..05fda64 100644 --- a/device/hid/hid_connection_linux.cc +++ b/device/hid/hid_connection_linux.cc
@@ -7,8 +7,8 @@ #include <errno.h> #include <linux/hidraw.h> #include <sys/ioctl.h> - #include <string> +#include <utility> #include "base/bind.h" #include "base/files/file_path.h" @@ -136,7 +136,7 @@ file_task_runner_(file_task_runner), weak_factory_(this) { task_runner_ = base::ThreadTaskRunnerHandle::Get(); - device_file_ = device_file.Pass(); + device_file_ = std::move(device_file); // The helper is passed a weak pointer to this connection so that it can be // cleaned up after the connection is closed.
diff --git a/device/hid/hid_service_linux.cc b/device/hid/hid_service_linux.cc index 6b48cda..f48e473 100644 --- a/device/hid/hid_service_linux.cc +++ b/device/hid/hid_service_linux.cc
@@ -8,6 +8,7 @@ #include <stdint.h> #include <limits> #include <string> +#include <utility> #include "base/bind.h" #include "base/files/file.h" @@ -310,7 +311,7 @@ return; } - FinishOpen(params.Pass()); + FinishOpen(std::move(params)); } #endif // defined(OS_CHROMEOS) @@ -334,9 +335,9 @@ // static void HidServiceLinux::CreateConnection(scoped_ptr<ConnectParams> params) { DCHECK(params->device_file.IsValid()); - params->callback.Run(make_scoped_refptr( - new HidConnectionLinux(params->device_info, params->device_file.Pass(), - params->file_task_runner))); + params->callback.Run(make_scoped_refptr(new HidConnectionLinux( + params->device_info, std::move(params->device_file), + params->file_task_runner))); } } // namespace device
diff --git a/device/serial/data_receiver.cc b/device/serial/data_receiver.cc index 82d0153f..508667ff 100644 --- a/device/serial/data_receiver.cc +++ b/device/serial/data_receiver.cc
@@ -5,6 +5,7 @@ #include "device/serial/data_receiver.h" #include <limits> +#include <utility> #include "base/bind.h" #include "base/message_loop/message_loop.h" @@ -83,7 +84,7 @@ struct DataReceiver::DataFrame { explicit DataFrame(mojo::Array<uint8_t> data) : is_error(false), - data(data.Pass()), + data(std::move(data)), offset(0), error(0), dispatched(false) {} @@ -112,8 +113,8 @@ mojo::InterfaceRequest<serial::DataSourceClient> client, uint32_t buffer_size, int32_t fatal_error_value) - : source_(source.Pass()), - client_(this, client.Pass()), + : source_(std::move(source)), + client_(this, std::move(client)), fatal_error_value_(fatal_error_value), shut_down_(false), weak_factory_(this) { @@ -159,7 +160,8 @@ } void DataReceiver::OnData(mojo::Array<uint8_t> data) { - pending_data_frames_.push(linked_ptr<DataFrame>(new DataFrame(data.Pass()))); + pending_data_frames_.push( + linked_ptr<DataFrame>(new DataFrame(std::move(data)))); if (pending_receive_) ReceiveInternal(); }
diff --git a/device/serial/data_sender.cc b/device/serial/data_sender.cc index fdf5171..962b8fd 100644 --- a/device/serial/data_sender.cc +++ b/device/serial/data_sender.cc
@@ -5,6 +5,7 @@ #include "device/serial/data_sender.h" #include <algorithm> +#include <utility> #include "base/bind.h" #include "base/message_loop/message_loop.h" @@ -49,7 +50,7 @@ DataSender::DataSender(mojo::InterfacePtr<serial::DataSink> sink, uint32_t buffer_size, int32_t fatal_error_value) - : sink_(sink.Pass()), + : sink_(std::move(sink)), fatal_error_value_(fatal_error_value), shut_down_(false) { sink_.set_connection_error_handler( @@ -166,7 +167,7 @@ mojo::Array<uint8_t> bytes(num_bytes_to_send); memcpy(&bytes[0], data_.data(), num_bytes_to_send); sender_->sink_->OnData( - bytes.Pass(), + std::move(bytes), base::Bind(&DataSender::PendingSend::OnDataSent, base::Unretained(this))); }
diff --git a/device/serial/data_sink_receiver.cc b/device/serial/data_sink_receiver.cc index 64ddea1..e1d2b9c 100644 --- a/device/serial/data_sink_receiver.cc +++ b/device/serial/data_sink_receiver.cc
@@ -5,6 +5,7 @@ #include "device/serial/data_sink_receiver.h" #include <limits> +#include <utility> #include "base/bind.h" #include "base/message_loop/message_loop.h" @@ -71,7 +72,7 @@ const ReadyCallback& ready_callback, const CancelCallback& cancel_callback, const ErrorCallback& error_callback) - : binding_(this, request.Pass()), + : binding_(this, std::move(request)), ready_callback_(ready_callback), cancel_callback_(cancel_callback), error_callback_(error_callback), @@ -123,7 +124,7 @@ return; } pending_data_buffers_.push( - linked_ptr<DataFrame>(new DataFrame(data.Pass(), callback))); + linked_ptr<DataFrame>(new DataFrame(std::move(data), callback))); if (!buffer_in_use_) RunReadyCallback(); } @@ -254,7 +255,7 @@ DataSinkReceiver::DataFrame::DataFrame( mojo::Array<uint8_t> data, const mojo::Callback<void(uint32_t, int32_t)>& callback) - : data_(data.Pass()), offset_(0), callback_(callback) { + : data_(std::move(data)), offset_(0), callback_(callback) { DCHECK_LT(0u, data_.size()); }
diff --git a/device/serial/data_sink_unittest.cc b/device/serial/data_sink_unittest.cc index 2b17791..a5872f5 100644 --- a/device/serial/data_sink_unittest.cc +++ b/device/serial/data_sink_unittest.cc
@@ -4,6 +4,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -47,7 +48,8 @@ base::Bind(&DataSinkTest::OnDataToRead, base::Unretained(this)), base::Bind(&DataSinkTest::OnCancel, base::Unretained(this)), base::Bind(&DataSinkTest::OnError, base::Unretained(this))); - sender_.reset(new DataSender(sink_handle.Pass(), kBufferSize, kFatalError)); + sender_.reset( + new DataSender(std::move(sink_handle), kBufferSize, kFatalError)); } void TearDown() override { @@ -158,7 +160,7 @@ } void OnDataToRead(scoped_ptr<ReadOnlyBuffer> buffer) { - read_buffer_ = buffer.Pass(); + read_buffer_ = std::move(buffer); read_buffer_contents_ = std::string(read_buffer_->GetData(), read_buffer_->GetSize()); EventReceived(EVENT_READ_BUFFER_READY);
diff --git a/device/serial/data_source_sender.cc b/device/serial/data_source_sender.cc index 5b42992..af2ddcb 100644 --- a/device/serial/data_source_sender.cc +++ b/device/serial/data_source_sender.cc
@@ -6,6 +6,7 @@ #include <algorithm> #include <limits> +#include <utility> #include "base/bind.h" #include "base/message_loop/message_loop.h" @@ -76,8 +77,8 @@ mojo::InterfacePtr<serial::DataSourceClient> client, const ReadyCallback& ready_callback, const ErrorCallback& error_callback) - : binding_(this, source.Pass()), - client_(client.Pass()), + : binding_(this, std::move(source)), + client_(std::move(client)), ready_callback_(ready_callback), error_callback_(error_callback), available_buffer_capacity_(0), @@ -162,7 +163,7 @@ if (!data.empty()) { mojo::Array<uint8_t> data_to_send(data.size()); std::copy(data.begin(), data.end(), &data_to_send[0]); - client_->OnData(data_to_send.Pass()); + client_->OnData(std::move(data_to_send)); } pending_send_.reset(); }
diff --git a/device/serial/data_source_unittest.cc b/device/serial/data_source_unittest.cc index ea871edf..5f30a6c 100644 --- a/device/serial/data_source_unittest.cc +++ b/device/serial/data_source_unittest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -40,12 +41,12 @@ mojo::GetProxy(&source_sender_client_handle); source_sender_ = new DataSourceSender( mojo::GetProxy(&source_sender_handle), - source_sender_client_handle.Pass(), + std::move(source_sender_client_handle), base::Bind(&DataSourceTest::CanWriteData, base::Unretained(this)), base::Bind(&DataSourceTest::OnError, base::Unretained(this))); - receiver_ = - new DataReceiver(source_sender_handle.Pass(), - source_sender_client_request.Pass(), 100, kFatalError); + receiver_ = new DataReceiver(std::move(source_sender_handle), + std::move(source_sender_client_request), 100, + kFatalError); } void TearDown() override { @@ -101,7 +102,7 @@ void OnDataReceived(scoped_ptr<ReadOnlyBuffer> buffer) { ASSERT_TRUE(buffer); error_ = 0; - buffer_ = buffer.Pass(); + buffer_ = std::move(buffer); buffer_contents_ = std::string(buffer_->GetData(), buffer_->GetSize()); EventReceived(EVENT_RECEIVE_COMPLETE); } @@ -113,7 +114,7 @@ } void CanWriteData(scoped_ptr<WritableBuffer> buffer) { - write_buffer_ = buffer.Pass(); + write_buffer_ = std::move(buffer); EventReceived(EVENT_WRITE_BUFFER_READY); }
diff --git a/device/serial/serial_connection.cc b/device/serial/serial_connection.cc index 6830cb3..249b892 100644 --- a/device/serial/serial_connection.cc +++ b/device/serial/serial_connection.cc
@@ -4,6 +4,8 @@ #include "device/serial/serial_connection.h" +#include <utility> + #include "base/bind.h" #include "device/serial/buffer.h" #include "device/serial/data_sink_receiver.h" @@ -18,14 +20,14 @@ mojo::InterfaceRequest<serial::DataSource> source, mojo::InterfacePtr<serial::DataSourceClient> source_client, mojo::InterfaceRequest<serial::Connection> request) - : io_handler_(io_handler), binding_(this, request.Pass()) { + : io_handler_(io_handler), binding_(this, std::move(request)) { receiver_ = new DataSinkReceiver( - sink.Pass(), + std::move(sink), base::Bind(&SerialConnection::OnSendPipeReady, base::Unretained(this)), base::Bind(&SerialConnection::OnSendCancelled, base::Unretained(this)), base::Bind(base::DoNothing)); sender_ = new DataSourceSender( - source.Pass(), source_client.Pass(), + std::move(source), std::move(source_client), base::Bind(&SerialConnection::OnReceivePipeReady, base::Unretained(this)), base::Bind(base::DoNothing)); } @@ -68,11 +70,11 @@ } void SerialConnection::OnSendPipeReady(scoped_ptr<ReadOnlyBuffer> buffer) { - io_handler_->Write(buffer.Pass()); + io_handler_->Write(std::move(buffer)); } void SerialConnection::OnReceivePipeReady(scoped_ptr<WritableBuffer> buffer) { - io_handler_->Read(buffer.Pass()); + io_handler_->Read(std::move(buffer)); } } // namespace device
diff --git a/device/serial/serial_connection_factory.cc b/device/serial/serial_connection_factory.cc index 49b9bc8..d167a78 100644 --- a/device/serial/serial_connection_factory.cc +++ b/device/serial/serial_connection_factory.cc
@@ -4,6 +4,8 @@ #include "device/serial/serial_connection_factory.h" +#include <utility> + #include "base/bind.h" #include "base/location.h" #include "base/macros.h" @@ -74,9 +76,9 @@ mojo::InterfaceRequest<serial::DataSink> sink, mojo::InterfaceRequest<serial::DataSource> source, mojo::InterfacePtr<serial::DataSourceClient> source_client) { - scoped_refptr<ConnectTask> task( - new ConnectTask(this, path, options.Pass(), connection_request.Pass(), - sink.Pass(), source.Pass(), source_client.Pass())); + scoped_refptr<ConnectTask> task(new ConnectTask( + this, path, std::move(options), std::move(connection_request), + std::move(sink), std::move(source), std::move(source_client))); task->Run(); } @@ -93,10 +95,10 @@ mojo::InterfacePtr<serial::DataSourceClient> source_client) : factory_(factory), path_(path), - options_(options.Pass()), - connection_request_(connection_request.Pass()), - sink_(sink.Pass()), - source_(source.Pass()), + options_(std::move(options)), + connection_request_(std::move(connection_request)), + sink_(std::move(sink)), + source_(std::move(source)), source_client_(source_client.PassInterface()) { if (!options_) { options_ = serial::ConnectionOptions::New(); @@ -126,9 +128,9 @@ return; } - new SerialConnection(io_handler_, sink_.Pass(), source_.Pass(), - mojo::MakeProxy(source_client_.Pass()), - connection_request_.Pass()); + new SerialConnection(io_handler_, std::move(sink_), std::move(source_), + mojo::MakeProxy(std::move(source_client_)), + std::move(connection_request_)); } } // namespace device
diff --git a/device/serial/serial_connection_unittest.cc b/device/serial/serial_connection_unittest.cc index f5b153a..c310755 100644 --- a/device/serial/serial_connection_unittest.cc +++ b/device/serial/serial_connection_unittest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <stdint.h> +#include "device/serial/serial_connection.h" +#include <stdint.h> #include <string> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -15,7 +17,6 @@ #include "device/serial/data_sender.h" #include "device/serial/data_stream.mojom.h" #include "device/serial/serial.mojom.h" -#include "device/serial/serial_connection.h" #include "device/serial/serial_service_impl.h" #include "device/serial/test_serial_io_handler.h" #include "mojo/public/cpp/bindings/interface_ptr.h" @@ -30,7 +31,7 @@ mojo::Array<serial::DeviceInfoPtr> devices(1); devices[0] = serial::DeviceInfo::New(); devices[0]->path = "device"; - return devices.Pass(); + return devices; } }; @@ -83,11 +84,11 @@ mojo::GetProxy(&source_client); service->Connect("device", serial::ConnectionOptions::New(), mojo::GetProxy(&connection_), mojo::GetProxy(&sink), - mojo::GetProxy(&source), source_client.Pass()); - sender_.reset(new DataSender(sink.Pass(), kBufferSize, + mojo::GetProxy(&source), std::move(source_client)); + sender_.reset(new DataSender(std::move(sink), kBufferSize, serial::SEND_ERROR_DISCONNECTED)); receiver_ = - new DataReceiver(source.Pass(), source_client_request.Pass(), + new DataReceiver(std::move(source), std::move(source_client_request), kBufferSize, serial::RECEIVE_ERROR_DISCONNECTED); connection_.set_connection_error_handler(base::Bind( &SerialConnectionTest::OnConnectionError, base::Unretained(this))); @@ -98,12 +99,12 @@ } void StoreInfo(serial::ConnectionInfoPtr options) { - info_ = options.Pass(); + info_ = std::move(options); EventReceived(EVENT_GOT_INFO); } void StoreControlSignals(serial::DeviceControlSignalsPtr signals) { - signals_ = signals.Pass(); + signals_ = std::move(signals); EventReceived(EVENT_GOT_CONTROL_SIGNALS); } @@ -218,10 +219,10 @@ options->data_bits = serial::DATA_BITS_SEVEN; options->has_cts_flow_control = true; options->cts_flow_control = true; - connection_->SetOptions(options.Pass(), - base::Bind(&SerialConnectionTest::StoreSuccess, - base::Unretained(this), - EVENT_SET_OPTIONS)); + connection_->SetOptions( + std::move(options), + base::Bind(&SerialConnectionTest::StoreSuccess, base::Unretained(this), + EVENT_SET_OPTIONS)); WaitForEvent(EVENT_SET_OPTIONS); ASSERT_TRUE(success_); serial::ConnectionInfo* info = io_handler_->connection_info(); @@ -254,10 +255,10 @@ signals->has_rts = true; signals->rts = true; - connection_->SetControlSignals(signals.Pass(), - base::Bind(&SerialConnectionTest::StoreSuccess, - base::Unretained(this), - EVENT_SET_CONTROL_SIGNALS)); + connection_->SetControlSignals( + std::move(signals), + base::Bind(&SerialConnectionTest::StoreSuccess, base::Unretained(this), + EVENT_SET_CONTROL_SIGNALS)); WaitForEvent(EVENT_SET_CONTROL_SIGNALS); ASSERT_TRUE(success_); EXPECT_TRUE(io_handler_->dtr());
diff --git a/device/serial/serial_device_enumerator_linux.cc b/device/serial/serial_device_enumerator_linux.cc index 9e308e7..d4af830 100644 --- a/device/serial/serial_device_enumerator_linux.cc +++ b/device/serial/serial_device_enumerator_linux.cc
@@ -5,6 +5,7 @@ #include "device/serial/serial_device_enumerator_linux.h" #include <stdint.h> +#include <utility> #include "base/logging.h" #include "base/strings/string_number_conversions.h" @@ -39,15 +40,15 @@ ScopedUdevEnumeratePtr enumerate(udev_enumerate_new(udev_.get())); if (!enumerate) { LOG(ERROR) << "Serial device enumeration failed."; - return devices.Pass(); + return devices; } if (udev_enumerate_add_match_subsystem(enumerate.get(), kSerialSubsystem)) { LOG(ERROR) << "Serial device enumeration failed."; - return devices.Pass(); + return devices; } if (udev_enumerate_scan_devices(enumerate.get())) { LOG(ERROR) << "Serial device enumeration failed."; - return devices.Pass(); + return devices; } udev_list_entry* entry = udev_enumerate_get_list_entry(enumerate.get()); @@ -84,10 +85,10 @@ } if (product_name) info->display_name = product_name; - devices.push_back(info.Pass()); + devices.push_back(std::move(info)); } } - return devices.Pass(); + return devices; } } // namespace device
diff --git a/device/serial/serial_io_handler.cc b/device/serial/serial_io_handler.cc index 480771b..ae63dab 100644 --- a/device/serial/serial_io_handler.cc +++ b/device/serial/serial_io_handler.cc
@@ -4,6 +4,8 @@ #include "device/serial/serial_io_handler.h" +#include <utility> + #include "base/bind.h" #include "base/files/file_path.h" #include "base/message_loop/message_loop.h" @@ -146,7 +148,7 @@ return; } - file_ = file.Pass(); + file_ = std::move(file); bool success = PostOpen() && ConfigurePortImpl(); if (!success) { @@ -164,7 +166,8 @@ if (file_.IsValid()) { DCHECK(file_thread_task_runner_.get()); file_thread_task_runner_->PostTask( - FROM_HERE, base::Bind(&SerialIoHandler::DoClose, Passed(file_.Pass()))); + FROM_HERE, + base::Bind(&SerialIoHandler::DoClose, Passed(std::move(file_)))); } } @@ -176,7 +179,7 @@ void SerialIoHandler::Read(scoped_ptr<WritableBuffer> buffer) { DCHECK(CalledOnValidThread()); DCHECK(!IsReadPending()); - pending_read_buffer_ = buffer.Pass(); + pending_read_buffer_ = std::move(buffer); read_canceled_ = false; AddRef(); ReadImpl(); @@ -185,7 +188,7 @@ void SerialIoHandler::Write(scoped_ptr<ReadOnlyBuffer> buffer) { DCHECK(CalledOnValidThread()); DCHECK(!IsWritePending()); - pending_write_buffer_ = buffer.Pass(); + pending_write_buffer_ = std::move(buffer); write_canceled_ = false; AddRef(); WriteImpl(); @@ -195,7 +198,8 @@ serial::ReceiveError error) { DCHECK(CalledOnValidThread()); DCHECK(IsReadPending()); - scoped_ptr<WritableBuffer> pending_read_buffer = pending_read_buffer_.Pass(); + scoped_ptr<WritableBuffer> pending_read_buffer = + std::move(pending_read_buffer_); if (error == serial::RECEIVE_ERROR_NONE) { pending_read_buffer->Done(bytes_read); } else { @@ -209,7 +213,7 @@ DCHECK(CalledOnValidThread()); DCHECK(IsWritePending()); scoped_ptr<ReadOnlyBuffer> pending_write_buffer = - pending_write_buffer_.Pass(); + std::move(pending_write_buffer_); if (error == serial::SEND_ERROR_NONE) { pending_write_buffer->Done(bytes_written); } else {
diff --git a/device/serial/serial_io_handler_posix.cc b/device/serial/serial_io_handler_posix.cc index b560174..45385e9 100644 --- a/device/serial/serial_io_handler_posix.cc +++ b/device/serial/serial_io_handler_posix.cc
@@ -398,7 +398,7 @@ signals->cts = (status & TIOCM_CTS) != 0; signals->dsr = (status & TIOCM_DSR) != 0; signals->ri = (status & TIOCM_RI) != 0; - return signals.Pass(); + return signals; } bool SerialIoHandlerPosix::SetControlSignals( @@ -478,7 +478,7 @@ info->stop_bits = (config.c_cflag & CSTOPB) ? serial::STOP_BITS_TWO : serial::STOP_BITS_ONE; info->cts_flow_control = (config.c_cflag & CRTSCTS) != 0; - return info.Pass(); + return info; } bool SerialIoHandlerPosix::SetBreak() {
diff --git a/device/serial/serial_service_impl.cc b/device/serial/serial_service_impl.cc index 962de63..3fc6a63 100644 --- a/device/serial/serial_service_impl.cc +++ b/device/serial/serial_service_impl.cc
@@ -5,6 +5,7 @@ #include "device/serial/serial_service_impl.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -15,17 +16,16 @@ SerialServiceImpl::SerialServiceImpl( scoped_refptr<SerialConnectionFactory> connection_factory, mojo::InterfaceRequest<serial::SerialService> request) - : connection_factory_(connection_factory), binding_(this, request.Pass()) { -} + : connection_factory_(connection_factory), + binding_(this, std::move(request)) {} SerialServiceImpl::SerialServiceImpl( scoped_refptr<SerialConnectionFactory> connection_factory, scoped_ptr<SerialDeviceEnumerator> device_enumerator, mojo::InterfaceRequest<serial::SerialService> request) - : device_enumerator_(device_enumerator.Pass()), + : device_enumerator_(std::move(device_enumerator)), connection_factory_(connection_factory), - binding_(this, request.Pass()) { -} + binding_(this, std::move(request)) {} SerialServiceImpl::~SerialServiceImpl() { } @@ -40,7 +40,7 @@ base::Bind(SerialIoHandler::Create, base::ThreadTaskRunnerHandle::Get(), ui_task_runner), io_task_runner), - request.Pass()); + std::move(request)); } // static @@ -68,9 +68,9 @@ mojo::InterfacePtr<serial::DataSourceClient> source_client) { if (!IsValidPath(path)) return; - connection_factory_->CreateConnection(path, options.Pass(), - connection_request.Pass(), sink.Pass(), - source.Pass(), source_client.Pass()); + connection_factory_->CreateConnection( + path, std::move(options), std::move(connection_request), std::move(sink), + std::move(source), std::move(source_client)); } SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() {
diff --git a/device/serial/serial_service_unittest.cc b/device/serial/serial_service_unittest.cc index e0105a00e..2b0468c 100644 --- a/device/serial/serial_service_unittest.cc +++ b/device/serial/serial_service_unittest.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "base/bind.h" #include "base/macros.h" #include "base/message_loop/message_loop.h" @@ -21,7 +23,7 @@ mojo::Array<serial::DeviceInfoPtr> devices(1); devices[0] = serial::DeviceInfo::New(); devices[0]->path = "device"; - return devices.Pass(); + return devices; } }; @@ -44,7 +46,7 @@ SerialServiceTest() : connected_(false), expecting_error_(false) {} void StoreDevices(mojo::Array<serial::DeviceInfoPtr> devices) { - devices_ = devices.Pass(); + devices_ = std::move(devices); StopMessageLoop(); } @@ -88,7 +90,7 @@ mojo::GetProxy(&source_client); service->Connect(path, serial::ConnectionOptions::New(), mojo::GetProxy(&connection), mojo::GetProxy(&sink), - mojo::GetProxy(&source), source_client.Pass()); + mojo::GetProxy(&source), std::move(source_client)); connection.set_connection_error_handler(base::Bind( &SerialServiceTest::OnConnectionError, base::Unretained(this))); expecting_error_ = !expecting_success;
diff --git a/device/serial/test_serial_io_handler.cc b/device/serial/test_serial_io_handler.cc index dec818486..b112462b4 100644 --- a/device/serial/test_serial_io_handler.cc +++ b/device/serial/test_serial_io_handler.cc
@@ -81,13 +81,13 @@ serial::DeviceControlSignalsPtr TestSerialIoHandler::GetControlSignals() const { serial::DeviceControlSignalsPtr signals(serial::DeviceControlSignals::New()); *signals = device_control_signals_; - return signals.Pass(); + return signals; } serial::ConnectionInfoPtr TestSerialIoHandler::GetPortInfo() const { serial::ConnectionInfoPtr info(serial::ConnectionInfo::New()); *info = info_; - return info.Pass(); + return info; } bool TestSerialIoHandler::Flush() const {
diff --git a/device/test/usb_test_gadget_impl.cc b/device/test/usb_test_gadget_impl.cc index be3b795..1515a4ee 100644 --- a/device/test/usb_test_gadget_impl.cc +++ b/device/test/usb_test_gadget_impl.cc
@@ -150,7 +150,7 @@ if (!context_) { net::URLRequestContextBuilder context_builder; context_builder.set_proxy_service(net::ProxyService::CreateDirect()); - context_ = context_builder.Build().Pass(); + context_ = context_builder.Build(); } return context_.get(); } @@ -522,7 +522,7 @@ scoped_ptr<UsbTestGadget> UsbTestGadget::Claim( scoped_refptr<base::SingleThreadTaskRunner> io_task_runner) { UsbGadgetFactory gadget_factory(io_task_runner); - return gadget_factory.WaitForDevice().Pass(); + return gadget_factory.WaitForDevice(); } UsbTestGadgetImpl::UsbTestGadgetImpl(
diff --git a/device/usb/usb_device_filter.cc b/device/usb/usb_device_filter.cc index 777d9fd..b8d47fa 100644 --- a/device/usb/usb_device_filter.cc +++ b/device/usb/usb_device_filter.cc
@@ -4,6 +4,8 @@ #include "device/usb/usb_device_filter.h" +#include <utility> + #include "base/values.h" #include "device/usb/usb_descriptors.h" #include "device/usb/usb_device.h" @@ -106,7 +108,7 @@ } } - return obj.Pass(); + return std::move(obj); } // static
diff --git a/device/usb/usb_device_handle_impl.cc b/device/usb/usb_device_handle_impl.cc index 16401fe..5bbbffe 100644 --- a/device/usb/usb_device_handle_impl.cc +++ b/device/usb/usb_device_handle_impl.cc
@@ -5,6 +5,7 @@ #include "device/usb/usb_device_handle_impl.h" #include <algorithm> +#include <utility> #include <vector> #include "base/bind.h" @@ -264,7 +265,7 @@ &UsbDeviceHandleImpl::Transfer::PlatformCallback, transfer.get(), timeout); - return transfer.Pass(); + return transfer; } // static @@ -293,7 +294,7 @@ &UsbDeviceHandleImpl::Transfer::PlatformCallback, transfer.get(), timeout); - return transfer.Pass(); + return transfer; } // static @@ -322,7 +323,7 @@ &UsbDeviceHandleImpl::Transfer::PlatformCallback, transfer.get(), timeout); - return transfer.Pass(); + return transfer; } // static @@ -357,7 +358,7 @@ packets, &Transfer::PlatformCallback, transfer.get(), timeout); libusb_set_iso_packet_lengths(transfer->platform_transfer_, packet_length); - return transfer.Pass(); + return transfer; } UsbDeviceHandleImpl::Transfer::Transfer( @@ -881,7 +882,7 @@ return; } - SubmitTransfer(transfer.Pass()); + SubmitTransfer(std::move(transfer)); } void UsbDeviceHandleImpl::IsochronousTransferInternal( @@ -912,7 +913,7 @@ this, endpoint_address, buffer, static_cast<int>(length), packets, packet_length, timeout, callback_task_runner, callback); - SubmitTransfer(transfer.Pass()); + SubmitTransfer(std::move(transfer)); } void UsbDeviceHandleImpl::GenericTransferInternal( @@ -965,7 +966,7 @@ return; } - SubmitTransfer(transfer.Pass()); + SubmitTransfer(std::move(transfer)); } void UsbDeviceHandleImpl::SubmitTransfer(scoped_ptr<Transfer> transfer) {
diff --git a/device/usb/usb_device_impl.h b/device/usb/usb_device_impl.h index fed3db8..337c0e86 100644 --- a/device/usb/usb_device_impl.h +++ b/device/usb/usb_device_impl.h
@@ -6,7 +6,7 @@ #define DEVICE_USB_USB_DEVICE_IMPL_H_ #include <stdint.h> - +#include <utility> #include <vector> #include "base/callback.h" @@ -61,7 +61,7 @@ } void set_device_path(const std::string& value) { device_path_ = value; } void set_webusb_allowed_origins(scoped_ptr<WebUsbDescriptorSet> descriptors) { - webusb_allowed_origins_ = descriptors.Pass(); + webusb_allowed_origins_ = std::move(descriptors); } void set_webusb_landing_page(const GURL& url) { webusb_landing_page_ = url; }
diff --git a/device/usb/usb_service_impl.cc b/device/usb/usb_service_impl.cc index 1f6ca57f..b169d83 100644 --- a/device/usb/usb_service_impl.cc +++ b/device/usb/usb_service_impl.cc
@@ -5,9 +5,9 @@ #include "device/usb/usb_service_impl.h" #include <stdint.h> - #include <list> #include <set> +#include <utility> #include "base/barrier_closure.h" #include "base/bind.h" @@ -197,7 +197,7 @@ if (descriptors->Parse( std::vector<uint8_t>(buffer->data(), buffer->data() + length))) { UsbDeviceImpl* device_impl = static_cast<UsbDeviceImpl*>(device.get()); - device_impl->set_webusb_allowed_origins(descriptors.Pass()); + device_impl->set_webusb_allowed_origins(std::move(descriptors)); } callback.Run(); }
diff --git a/device/vibration/vibration_manager_impl_default.cc b/device/vibration/vibration_manager_impl_default.cc index 25dba50c..02c5a01 100644 --- a/device/vibration/vibration_manager_impl_default.cc +++ b/device/vibration/vibration_manager_impl_default.cc
@@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "device/vibration/vibration_manager_impl.h" - #include <stdint.h> +#include <utility> +#include "device/vibration/vibration_manager_impl.h" #include "mojo/public/cpp/bindings/strong_binding.h" namespace device { @@ -22,7 +22,7 @@ explicit VibrationManagerEmptyImpl( mojo::InterfaceRequest<VibrationManager> request) - : binding_(this, request.Pass()) {} + : binding_(this, std::move(request)) {} ~VibrationManagerEmptyImpl() override {} // The binding between this object and the other end of the pipe. @@ -34,7 +34,7 @@ // static void VibrationManagerImpl::Create( mojo::InterfaceRequest<VibrationManager> request) { - new VibrationManagerEmptyImpl(request.Pass()); + new VibrationManagerEmptyImpl(std::move(request)); } } // namespace device
diff --git a/gin/isolate_holder.cc b/gin/isolate_holder.cc index 45f689a..d2e494c 100644 --- a/gin/isolate_holder.cc +++ b/gin/isolate_holder.cc
@@ -7,6 +7,7 @@ #include <stddef.h> #include <stdlib.h> #include <string.h> +#include <utility> #include "base/logging.h" #include "base/message_loop/message_loop.h" @@ -97,7 +98,7 @@ void IsolateHolder::EnableIdleTasks( scoped_ptr<V8IdleTaskRunner> idle_task_runner) { DCHECK(isolate_data_.get()); - isolate_data_->EnableIdleTasks(idle_task_runner.Pass()); + isolate_data_->EnableIdleTasks(std::move(idle_task_runner)); } } // namespace gin
diff --git a/gin/modules/module_registry.cc b/gin/modules/module_registry.cc index 10d5464..deec187 100644 --- a/gin/modules/module_registry.cc +++ b/gin/modules/module_registry.cc
@@ -6,8 +6,8 @@ #include <stddef.h> #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/logging.h" @@ -83,7 +83,7 @@ ModuleRegistry* registry = ModuleRegistry::From(args.isolate()->GetCurrentContext()); - registry->AddPendingModule(args.isolate(), pending.Pass()); + registry->AddPendingModule(args.isolate(), std::move(pending)); } WrapperInfo g_wrapper_info = { kEmbedderNativeGin }; @@ -161,7 +161,7 @@ scoped_ptr<PendingModule> pending) { const std::string pending_id = pending->id; const std::vector<std::string> pending_dependencies = pending->dependencies; - AttemptToLoad(isolate, pending.Pass()); + AttemptToLoad(isolate, std::move(pending)); FOR_EACH_OBSERVER(ModuleRegistryObserver, observer_list_, OnDidAddPendingModule(pending_id, pending_dependencies)); } @@ -258,7 +258,7 @@ pending_modules_.push_back(pending.release()); return false; } - return Load(isolate, pending.Pass()); + return Load(isolate, std::move(pending)); } v8::Local<v8::Value> ModuleRegistry::GetModule(v8::Isolate* isolate, @@ -278,7 +278,7 @@ for (size_t i = 0; i < pending_modules.size(); ++i) { scoped_ptr<PendingModule> pending(pending_modules[i]); pending_modules[i] = NULL; - if (AttemptToLoad(isolate, pending.Pass())) + if (AttemptToLoad(isolate, std::move(pending))) keep_trying = true; } }
diff --git a/gin/per_isolate_data.cc b/gin/per_isolate_data.cc index cec08217..a610158 100644 --- a/gin/per_isolate_data.cc +++ b/gin/per_isolate_data.cc
@@ -4,6 +4,8 @@ #include "gin/per_isolate_data.h" +#include <utility> + #include "base/logging.h" #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" @@ -113,7 +115,7 @@ void PerIsolateData::EnableIdleTasks( scoped_ptr<V8IdleTaskRunner> idle_task_runner) { - idle_task_runner_ = idle_task_runner.Pass(); + idle_task_runner_ = std::move(idle_task_runner); } } // namespace gin
diff --git a/google_apis/drive/base_requests.cc b/google_apis/drive/base_requests.cc index a1981387..3e5b0d1d 100644 --- a/google_apis/drive/base_requests.cc +++ b/google_apis/drive/base_requests.cc
@@ -5,6 +5,7 @@ #include "google_apis/drive/base_requests.h" #include <stddef.h> +#include <utility> #include "base/files/file_util.h" #include "base/json/json_reader.h" @@ -214,7 +215,7 @@ LOG(WARNING) << "Error while parsing entry response: " << error_message << ", code: " << error_code << ", json:\n" << trimmed_json; } - return value.Pass(); + return value; } void GenerateMultipartBody(MultipartType multipart_type, @@ -742,7 +743,7 @@ DCHECK(CalledOnValidThread()); DCHECK(code == HTTP_CREATED || code == HTTP_SUCCESS); - OnRangeRequestComplete(UploadRangeResponse(code, -1, -1), value.Pass()); + OnRangeRequestComplete(UploadRangeResponse(code, -1, -1), std::move(value)); OnProcessURLFetchResultsComplete(); }
diff --git a/google_apis/drive/base_requests_unittest.cc b/google_apis/drive/base_requests_unittest.cc index e5baf6c..aa12ab8 100644 --- a/google_apis/drive/base_requests_unittest.cc +++ b/google_apis/drive/base_requests_unittest.cc
@@ -5,6 +5,7 @@ #include "google_apis/drive/base_requests.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -129,7 +130,7 @@ response->set_code(response_code_); response->set_content(response_body_); response->set_content_type("application/json"); - return response.Pass(); + return std::move(response); } base::MessageLoopForIO message_loop_;
diff --git a/google_apis/drive/drive_api_parser.cc b/google_apis/drive/drive_api_parser.cc index ff08eb7..579f166 100644 --- a/google_apis/drive/drive_api_parser.cc +++ b/google_apis/drive/drive_api_parser.cc
@@ -222,7 +222,7 @@ LOG(ERROR) << "Unable to create: Invalid About resource JSON!"; return scoped_ptr<AboutResource>(); } - return resource.Pass(); + return resource; } // static @@ -277,7 +277,7 @@ LOG(ERROR) << "Unable to create: Invalid DriveAppIcon JSON!"; return scoped_ptr<DriveAppIcon>(); } - return resource.Pass(); + return resource; } bool DriveAppIcon::Parse(const base::Value& value) { @@ -342,7 +342,7 @@ LOG(ERROR) << "Unable to create: Invalid AppResource JSON!"; return scoped_ptr<AppResource>(); } - return resource.Pass(); + return resource; } bool AppResource::Parse(const base::Value& value) { @@ -376,7 +376,7 @@ LOG(ERROR) << "Unable to create: Invalid AppList JSON!"; return scoped_ptr<AppList>(); } - return resource.Pass(); + return resource; } bool AppList::Parse(const base::Value& value) { @@ -413,7 +413,7 @@ LOG(ERROR) << "Unable to create: Invalid ParentRefernce JSON!"; return scoped_ptr<ParentReference>(); } - return reference.Pass(); + return reference; } bool ParentReference::Parse(const base::Value& value) { @@ -485,7 +485,7 @@ LOG(ERROR) << "Unable to create: Invalid FileResource JSON!"; return scoped_ptr<FileResource>(); } - return resource.Pass(); + return resource; } bool FileResource::IsDirectory() const { @@ -536,7 +536,7 @@ LOG(ERROR) << "Unable to create: Invalid FileList JSON!"; return scoped_ptr<FileList>(); } - return resource.Pass(); + return resource; } bool FileList::Parse(const base::Value& value) { @@ -577,7 +577,7 @@ LOG(ERROR) << "Unable to create: Invalid ChangeResource JSON!"; return scoped_ptr<ChangeResource>(); } - return resource.Pass(); + return resource; } bool ChangeResource::Parse(const base::Value& value) { @@ -620,7 +620,7 @@ LOG(ERROR) << "Unable to create: Invalid ChangeList JSON!"; return scoped_ptr<ChangeList>(); } - return resource.Pass(); + return resource; } bool ChangeList::Parse(const base::Value& value) { @@ -653,7 +653,7 @@ LOG(ERROR) << "Unable to create: Invalid FileLabels JSON!"; return scoped_ptr<FileLabels>(); } - return resource.Pass(); + return resource; } bool FileLabels::Parse(const base::Value& value) { @@ -694,7 +694,7 @@ LOG(ERROR) << "Unable to create: Invalid ImageMediaMetadata JSON!"; return scoped_ptr<ImageMediaMetadata>(); } - return resource.Pass(); + return resource; } bool ImageMediaMetadata::Parse(const base::Value& value) {
diff --git a/google_apis/drive/drive_api_parser.h b/google_apis/drive/drive_api_parser.h index 907b23b3..b6734e58 100644 --- a/google_apis/drive/drive_api_parser.h +++ b/google_apis/drive/drive_api_parser.h
@@ -6,8 +6,8 @@ #define GOOGLE_APIS_DRIVE_DRIVE_API_PARSER_H_ #include <stdint.h> - #include <string> +#include <utility> #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" @@ -234,22 +234,22 @@ void set_removable(bool removable) { removable_ = removable; } void set_primary_mimetypes( ScopedVector<std::string> primary_mimetypes) { - primary_mimetypes_ = primary_mimetypes.Pass(); + primary_mimetypes_ = std::move(primary_mimetypes); } void set_secondary_mimetypes( ScopedVector<std::string> secondary_mimetypes) { - secondary_mimetypes_ = secondary_mimetypes.Pass(); + secondary_mimetypes_ = std::move(secondary_mimetypes); } void set_primary_file_extensions( ScopedVector<std::string> primary_file_extensions) { - primary_file_extensions_ = primary_file_extensions.Pass(); + primary_file_extensions_ = std::move(primary_file_extensions); } void set_secondary_file_extensions( ScopedVector<std::string> secondary_file_extensions) { - secondary_file_extensions_ = secondary_file_extensions.Pass(); + secondary_file_extensions_ = std::move(secondary_file_extensions); } void set_icons(ScopedVector<DriveAppIcon> icons) { - icons_ = icons.Pass(); + icons_ = std::move(icons); } void set_create_url(const GURL& url) { create_url_ = url; @@ -303,9 +303,7 @@ void set_etag(const std::string& etag) { etag_ = etag; } - void set_items(ScopedVector<AppResource> items) { - items_ = items.Pass(); - } + void set_items(ScopedVector<AppResource> items) { items_ = std::move(items); } private: friend class DriveAPIParserTest; @@ -675,9 +673,7 @@ void set_deleted(bool deleted) { deleted_ = deleted; } - void set_file(scoped_ptr<FileResource> file) { - file_ = file.Pass(); - } + void set_file(scoped_ptr<FileResource> file) { file_ = std::move(file); } void set_modification_date(const base::Time& modification_date) { modification_date_ = modification_date; }
diff --git a/google_apis/drive/drive_api_requests.cc b/google_apis/drive/drive_api_requests.cc index a14210ec..e70a5f2 100644 --- a/google_apis/drive/drive_api_requests.cc +++ b/google_apis/drive/drive_api_requests.cc
@@ -5,6 +5,7 @@ #include "google_apis/drive/drive_api_requests.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -77,7 +78,7 @@ } } - callback.Run(response, file_resource.Pass()); + callback.Run(response, std::move(file_resource)); } // Attaches |properties| to the |request_body| if |properties| is not empty. @@ -949,7 +950,7 @@ const UploadRangeResponse& response, scoped_ptr<base::Value> value) { DCHECK(CalledOnValidThread()); - ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass()); + ParseFileResourceWithUploadRangeAndRun(callback_, response, std::move(value)); } void ResumeUploadRequest::OnURLFetchUploadProgress( @@ -978,7 +979,7 @@ const UploadRangeResponse& response, scoped_ptr<base::Value> value) { DCHECK(CalledOnValidThread()); - ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass()); + ParseFileResourceWithUploadRangeAndRun(callback_, response, std::move(value)); } //======================= MultipartUploadNewFileDelegate =======================
diff --git a/google_apis/drive/drive_api_requests.h b/google_apis/drive/drive_api_requests.h index b34f970..2355576 100644 --- a/google_apis/drive/drive_api_requests.h +++ b/google_apis/drive/drive_api_requests.h
@@ -6,8 +6,8 @@ #define GOOGLE_APIS_DRIVE_DRIVE_API_REQUESTS_H_ #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/callback_forward.h" @@ -169,7 +169,7 @@ void OnDataParsed(DriveApiErrorCode error, scoped_ptr<DataType> value) { if (!value) error = DRIVE_PARSE_ERROR; - callback_.Run(error, value.Pass()); + callback_.Run(error, std::move(value)); OnProcessURLFetchResultsComplete(); }
diff --git a/google_apis/drive/drive_api_requests_unittest.cc b/google_apis/drive/drive_api_requests_unittest.cc index 07feea49..0912d61 100644 --- a/google_apis/drive/drive_api_requests_unittest.cc +++ b/google_apis/drive/drive_api_requests_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "google_apis/drive/drive_api_requests.h" + #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/files/file_path.h" @@ -16,7 +19,6 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "google_apis/drive/drive_api_parser.h" -#include "google_apis/drive/drive_api_requests.h" #include "google_apis/drive/drive_api_url_generator.h" #include "google_apis/drive/dummy_auth_service.h" #include "google_apis/drive/request_sender.h" @@ -244,7 +246,7 @@ scoped_ptr<net::test_server::BasicHttpResponse> http_response( new net::test_server::BasicHttpResponse); http_response->set_code(net::HTTP_NO_CONTENT); - return http_response.Pass(); + return std::move(http_response); } // Reads the data file of |expected_data_file_path_| and returns its content @@ -282,7 +284,7 @@ new net::test_server::BasicHttpResponse); response->set_code(net::HTTP_NO_CONTENT); - return response.Pass(); + return std::move(response); } // Returns PRECONDITION_FAILED response for ETag mismatching with error JSON @@ -309,7 +311,7 @@ response->set_content_type("application/json"); } - return response.Pass(); + return std::move(response); } // Returns the response based on set expected upload url. @@ -344,7 +346,7 @@ response->AddCustomHeader( "Location", test_server_.base_url().Resolve(expected_upload_path_).spec()); - return response.Pass(); + return std::move(response); } scoped_ptr<net::test_server::HttpResponse> HandleResumeUploadRequest( @@ -394,7 +396,7 @@ "Range", "bytes=0-" + base::Int64ToString(received_bytes_ - 1)); } - return response.Pass(); + return std::move(response); } // All bytes are received. Return the "success" response with the file's @@ -408,7 +410,7 @@ response->set_code(net::HTTP_CREATED); } - return response.Pass(); + return std::move(response); } // Returns the response based on set expected content and its type. @@ -429,7 +431,7 @@ response->set_code(net::HTTP_OK); response->set_content_type(expected_content_type_); response->set_content(expected_content_); - return response.Pass(); + return std::move(response); } // Handles a request for downloading a file. @@ -451,7 +453,7 @@ response->set_code(net::HTTP_OK); response->set_content(id + id + id); response->set_content_type("text/plain"); - return response.Pass(); + return std::move(response); } scoped_ptr<net::test_server::HttpResponse> HandleBatchUploadRequest( @@ -489,7 +491,7 @@ " {\"reason\": \"userRateLimitExceeded\"}]}}\r\n" "\r\n" "--BOUNDARY--\r\n"); - return response.Pass(); + return std::move(response); } // These are for the current upload file status.
diff --git a/google_apis/drive/files_list_request_runner.cc b/google_apis/drive/files_list_request_runner.cc index c3588b7..0de92ab 100644 --- a/google_apis/drive/files_list_request_runner.cc +++ b/google_apis/drive/files_list_request_runner.cc
@@ -4,6 +4,8 @@ #include "google_apis/drive/files_list_request_runner.h" +#include <utility> + #include "base/bind.h" #include "base/metrics/histogram_macros.h" #include "base/metrics/sparse_histogram.h" @@ -73,7 +75,7 @@ return; } - callback.Run(error, entry.Pass()); + callback.Run(error, std::move(entry)); } void FilesListRequestRunner::SetRequestCompletedCallbackForTesting(
diff --git a/google_apis/drive/request_util.cc b/google_apis/drive/request_util.cc index 1e55285..cfaaa7da 100644 --- a/google_apis/drive/request_util.cc +++ b/google_apis/drive/request_util.cc
@@ -30,7 +30,7 @@ scoped_ptr<base::DictionaryValue> parent(new base::DictionaryValue); parent->SetString("kind", kParentLinkKind); parent->SetString("id", file_id); - return parent.Pass(); + return parent; } } // namespace util
diff --git a/google_apis/drive/test_util.cc b/google_apis/drive/test_util.cc index 64216af..e79a24e 100644 --- a/google_apis/drive/test_util.cc +++ b/google_apis/drive/test_util.cc
@@ -85,7 +85,7 @@ scoped_ptr<base::Value> value = deserializer.Deserialize(NULL, &error); LOG_IF(WARNING, !value.get()) << "Failed to parse " << path.value() << ": " << error; - return value.Pass(); + return value; } // Returns a HttpResponse created from the given file path. @@ -105,7 +105,7 @@ http_response->set_code(net::HTTP_OK); http_response->set_content(content); http_response->set_content_type(content_type); - return http_response.Pass(); + return http_response; } scoped_ptr<net::test_server::HttpResponse> HandleDownloadFileRequest(
diff --git a/google_apis/drive/test_util.h b/google_apis/drive/test_util.h index f959ad7..f3fbf8d 100644 --- a/google_apis/drive/test_util.h +++ b/google_apis/drive/test_util.h
@@ -155,7 +155,7 @@ static const T& Move(const T* in) { return *in; } }; template<typename T> struct MoveHelper<true, T> { - static T Move(T* in) { return in->Pass(); } + static T Move(T* in) { return std::move(*in); } }; // Helper to handle Chrome's move semantics correctly.
diff --git a/google_apis/gaia/fake_gaia.cc b/google_apis/gaia/fake_gaia.cc index 9c7e483c..82c366b 100644 --- a/google_apis/gaia/fake_gaia.cc +++ b/google_apis/gaia/fake_gaia.cc
@@ -4,6 +4,7 @@ #include "google_apis/gaia/fake_gaia.h" +#include <utility> #include <vector> #include "base/base_paths.h" @@ -308,7 +309,7 @@ return scoped_ptr<HttpResponse>(); // Request not understood. } - return http_response.Pass(); + return std::move(http_response); } void FakeGaia::IssueOAuthToken(const std::string& auth_token,
diff --git a/google_apis/gaia/gaia_oauth_client.cc b/google_apis/gaia/gaia_oauth_client.cc index c021623..618ecd4 100644 --- a/google_apis/gaia/gaia_oauth_client.cc +++ b/google_apis/gaia/gaia_oauth_client.cc
@@ -4,6 +4,8 @@ #include "google_apis/gaia/gaia_oauth_client.h" +#include <utility> + #include "base/json/json_reader.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -250,7 +252,7 @@ // Move ownership of the request fetcher into a local scoped_ptr which // will be nuked when we're done handling the request, unless we need // to retry, in which case ownership will be returned to request_. - scoped_ptr<net::URLFetcher> old_request = request_.Pass(); + scoped_ptr<net::URLFetcher> old_request = std::move(request_); DCHECK_EQ(source, old_request.get()); // HTTP_BAD_REQUEST means the arguments are invalid. HTTP_UNAUTHORIZED means @@ -283,7 +285,7 @@ // Retry limit reached. Give up. delegate_->OnNetworkError(source->GetResponseCode()); } else { - request_ = old_request.Pass(); + request_ = std::move(old_request); *should_retry_request = true; } return; @@ -308,12 +310,12 @@ } case USER_INFO: { - delegate_->OnGetUserInfoResponse(response_dict.Pass()); + delegate_->OnGetUserInfoResponse(std::move(response_dict)); break; } case TOKEN_INFO: { - delegate_->OnGetTokenInfoResponse(response_dict.Pass()); + delegate_->OnGetTokenInfoResponse(std::move(response_dict)); break; }
diff --git a/google_apis/gaia/oauth2_token_service.cc b/google_apis/gaia/oauth2_token_service.cc index 72885a4..ed20d13 100644 --- a/google_apis/gaia/oauth2_token_service.cc +++ b/google_apis/gaia/oauth2_token_service.cc
@@ -5,7 +5,7 @@ #include "google_apis/gaia/oauth2_token_service.h" #include <stdint.h> - +#include <utility> #include <vector> #include "base/bind.h" @@ -507,7 +507,7 @@ error, std::string(), base::Time())); - return request.Pass(); + return std::move(request); } RequestParameters request_parameters(client_id, @@ -529,7 +529,7 @@ client_secret, scopes); } - return request.Pass(); + return std::move(request); } void OAuth2TokenService::FetchOAuth2Token(RequestImpl* request,
diff --git a/google_apis/gaia/oauth2_token_service_request.cc b/google_apis/gaia/oauth2_token_service_request.cc index d843b041..819e3ca 100644 --- a/google_apis/gaia/oauth2_token_service_request.cc +++ b/google_apis/gaia/oauth2_token_service_request.cc
@@ -220,7 +220,7 @@ void RequestCore::StartOnTokenServiceThread() { DCHECK(token_service_task_runner()->BelongsToCurrentThread()); - request_ = token_service()->StartRequest(account_id_, scopes_, this).Pass(); + request_ = token_service()->StartRequest(account_id_, scopes_, this); } void RequestCore::StopOnTokenServiceThread() { @@ -336,7 +336,7 @@ scoped_refptr<Core> core( new RequestCore(request.get(), provider, consumer, account_id, scopes)); request->StartWithCore(core); - return request.Pass(); + return request; } // static
diff --git a/google_apis/gcm/base/mcs_message.cc b/google_apis/gcm/base/mcs_message.cc index c3d5151..8673426 100644 --- a/google_apis/gcm/base/mcs_message.cc +++ b/google_apis/gcm/base/mcs_message.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/base/mcs_message.h" +#include <utility> + #include "base/logging.h" #include "google_apis/gcm/base/mcs_util.h" @@ -15,13 +17,13 @@ const google::protobuf::MessageLite& protobuf) { scoped_ptr<google::protobuf::MessageLite> owned_protobuf(protobuf.New()); owned_protobuf->CheckTypeAndMergeFrom(protobuf); - protobuf_ = owned_protobuf.Pass(); + protobuf_ = std::move(owned_protobuf); } MCSMessage::Core::Core( uint8_t tag, scoped_ptr<const google::protobuf::MessageLite> protobuf) { - protobuf_ = protobuf.Pass(); + protobuf_ = std::move(protobuf); } MCSMessage::Core::~Core() {} @@ -48,7 +50,7 @@ scoped_ptr<const google::protobuf::MessageLite> protobuf) : tag_(tag), size_(protobuf->ByteSize()), - core_(new Core(tag_, protobuf.Pass())) { + core_(new Core(tag_, std::move(protobuf))) { DCHECK_EQ(tag, GetMCSProtoTag(core_->Get())); } @@ -70,7 +72,7 @@ scoped_ptr<google::protobuf::MessageLite> MCSMessage::CloneProtobuf() const { scoped_ptr<google::protobuf::MessageLite> clone(GetProtobuf().New()); clone->CheckTypeAndMergeFrom(GetProtobuf()); - return clone.Pass(); + return clone; } } // namespace gcm
diff --git a/google_apis/gcm/base/mcs_message_unittest.cc b/google_apis/gcm/base/mcs_message_unittest.cc index c27a7c5..acbf334 100644 --- a/google_apis/gcm/base/mcs_message_unittest.cc +++ b/google_apis/gcm/base/mcs_message_unittest.cc
@@ -5,6 +5,7 @@ #include "google_apis/gcm/base/mcs_message.h" #include <stdint.h> +#include <utility> #include "base/logging.h" #include "base/test/test_simple_task_runner.h" @@ -82,7 +83,7 @@ BuildLoginRequest(kAndroidId, kSecret, "")); scoped_ptr<google::protobuf::MessageLite> login_copy( new mcs_proto::LoginRequest(*login_request)); - MCSMessage message(kLoginRequestTag, login_copy.Pass()); + MCSMessage message(kLoginRequestTag, std::move(login_copy)); EXPECT_FALSE(login_copy.get()); ASSERT_TRUE(message.IsValid()); EXPECT_EQ(kLoginRequestTag, message.tag());
diff --git a/google_apis/gcm/base/mcs_util.cc b/google_apis/gcm/base/mcs_util.cc index b35b23c6..e79355c 100644 --- a/google_apis/gcm/base/mcs_util.cc +++ b/google_apis/gcm/base/mcs_util.cc
@@ -81,7 +81,7 @@ login_request->add_setting(); login_request->mutable_setting(0)->set_name(kLoginSettingDefaultName); login_request->mutable_setting(0)->set_value(kLoginSettingDefaultValue); - return login_request.Pass(); + return login_request; } scoped_ptr<mcs_proto::IqStanza> BuildStreamAck() { @@ -90,7 +90,7 @@ stream_ack_iq->set_id(""); stream_ack_iq->mutable_extension()->set_id(kStreamAck); stream_ack_iq->mutable_extension()->set_data(""); - return stream_ack_iq.Pass(); + return stream_ack_iq; } scoped_ptr<mcs_proto::IqStanza> BuildSelectiveAck( @@ -104,7 +104,7 @@ selective_ack.add_id(acked_ids[i]); selective_ack_iq->mutable_extension()->set_data( selective_ack.SerializeAsString()); - return selective_ack_iq.Pass(); + return selective_ack_iq; } // Utility method to build a google::protobuf::MessageLite object from a MCS
diff --git a/google_apis/gcm/engine/connection_factory_impl.cc b/google_apis/gcm/engine/connection_factory_impl.cc index 19f456c..43bac40 100644 --- a/google_apis/gcm/engine/connection_factory_impl.cc +++ b/google_apis/gcm/engine/connection_factory_impl.cc
@@ -107,11 +107,10 @@ void ConnectionFactoryImpl::Connect() { if (!connection_handler_) { connection_handler_ = CreateConnectionHandler( - base::TimeDelta::FromMilliseconds(kReadTimeoutMs), - read_callback_, + base::TimeDelta::FromMilliseconds(kReadTimeoutMs), read_callback_, write_callback_, base::Bind(&ConnectionFactoryImpl::ConnectionHandlerCallback, - weak_ptr_factory_.GetWeakPtr())).Pass(); + weak_ptr_factory_.GetWeakPtr())); } if (connecting_ || waiting_for_backoff_)
diff --git a/google_apis/gcm/engine/connection_factory_impl_unittest.cc b/google_apis/gcm/engine/connection_factory_impl_unittest.cc index 7e8bc02..56ed855 100644 --- a/google_apis/gcm/engine/connection_factory_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_factory_impl_unittest.cc
@@ -5,6 +5,7 @@ #include "google_apis/gcm/engine/connection_factory_impl.h" #include <cmath> +#include <utility> #include "base/message_loop/message_loop.h" #include "base/run_loop.h" @@ -201,7 +202,7 @@ const ConnectionHandler::ProtoReceivedCallback& read_callback, const ConnectionHandler::ProtoSentCallback& write_callback, const ConnectionHandler::ConnectionChangedCallback& connection_callback) { - return scoped_handler_.Pass(); + return std::move(scoped_handler_); } base::TimeTicks TestConnectionFactoryImpl::NowTicks() {
diff --git a/google_apis/gcm/engine/connection_handler_impl.cc b/google_apis/gcm/engine/connection_handler_impl.cc index 0b7dce9..eb3e01e 100644 --- a/google_apis/gcm/engine/connection_handler_impl.cc +++ b/google_apis/gcm/engine/connection_handler_impl.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/connection_handler_impl.h" +#include <utility> + #include "base/location.h" #include "base/thread_task_runner_handle.h" #include "google/protobuf/io/coded_stream.h" @@ -388,7 +390,7 @@ FROM_HERE, base::Bind(&ConnectionHandlerImpl::GetNextMessage, weak_ptr_factory_.GetWeakPtr())); - read_callback_.Run(protobuf.Pass()); + read_callback_.Run(std::move(protobuf)); return; } @@ -470,7 +472,7 @@ connection_callback_.Run(net::OK); } } - read_callback_.Run(protobuf.Pass()); + read_callback_.Run(std::move(protobuf)); } void ConnectionHandlerImpl::OnTimeout() {
diff --git a/google_apis/gcm/engine/connection_handler_impl_unittest.cc b/google_apis/gcm/engine/connection_handler_impl_unittest.cc index 2aabba3..36b9ad3 100644 --- a/google_apis/gcm/engine/connection_handler_impl_unittest.cc +++ b/google_apis/gcm/engine/connection_handler_impl_unittest.cc
@@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/connection_handler_impl.h" #include <stdint.h> - #include <string> +#include <utility> #include "base/bind.h" #include "base/memory/scoped_ptr.h" @@ -244,7 +244,7 @@ void GCMConnectionHandlerImplTest::ReadContinuation( ScopedMessage* dst_proto, ScopedMessage new_proto) { - *dst_proto = new_proto.Pass(); + *dst_proto = std::move(new_proto); run_loop_->Quit(); }
diff --git a/google_apis/gcm/engine/fake_connection_handler.cc b/google_apis/gcm/engine/fake_connection_handler.cc index 243c280..86c2561 100644 --- a/google_apis/gcm/engine/fake_connection_handler.cc +++ b/google_apis/gcm/engine/fake_connection_handler.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/fake_connection_handler.h" +#include <utility> + #include "base/logging.h" #include "google_apis/gcm/base/mcs_util.h" #include "net/socket/stream_socket.h" @@ -20,7 +22,7 @@ login_response->set_id("id"); if (fail_login) login_response->mutable_error()->set_code(1); - return login_response.Pass(); + return std::move(login_response); } } // namespace
diff --git a/google_apis/gcm/engine/gcm_store_impl.cc b/google_apis/gcm/engine/gcm_store_impl.cc index e3127b9..49939b5b 100644 --- a/google_apis/gcm/engine/gcm_store_impl.cc +++ b/google_apis/gcm/engine/gcm_store_impl.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/gcm_store_impl.h" +#include <utility> + #include "base/bind.h" #include "base/callback.h" #include "base/files/file_path.h" @@ -271,8 +273,7 @@ scoped_ptr<Encryptor> encryptor) : path_(path), foreground_task_runner_(foreground_task_runner), - encryptor_(encryptor.Pass()) { -} + encryptor_(std::move(encryptor)) {} GCMStoreImpl::Backend::~Backend() {} @@ -1165,10 +1166,9 @@ scoped_ptr<Encryptor> encryptor) : backend_(new Backend(path, base::ThreadTaskRunnerHandle::Get(), - encryptor.Pass())), + std::move(encryptor))), blocking_task_runner_(blocking_task_runner), - weak_ptr_factory_(this) { -} + weak_ptr_factory_(this) {} GCMStoreImpl::~GCMStoreImpl() {} @@ -1430,7 +1430,7 @@ FROM_HERE_WITH_EXPLICIT_FUNCTION( "477117 GCMStoreImpl::LoadContinuation")); if (!result->success) { - callback.Run(result.Pass()); + callback.Run(std::move(result)); return; } int num_throttled_apps = 0; @@ -1448,7 +1448,7 @@ num_throttled_apps++; } UMA_HISTOGRAM_COUNTS("GCM.NumThrottledApps", num_throttled_apps); - callback.Run(result.Pass()); + callback.Run(std::move(result)); } void GCMStoreImpl::AddOutgoingMessageContinuation(
diff --git a/google_apis/gcm/engine/gcm_store_impl_unittest.cc b/google_apis/gcm/engine/gcm_store_impl_unittest.cc index 62bee771..684615d1 100644 --- a/google_apis/gcm/engine/gcm_store_impl_unittest.cc +++ b/google_apis/gcm/engine/gcm_store_impl_unittest.cc
@@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/gcm_store_impl.h" #include <stdint.h> - #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -110,13 +110,13 @@ scoped_ptr<GCMStore::LoadResult>* result_dst, scoped_ptr<GCMStore::LoadResult> result) { ASSERT_TRUE(result->success); - LoadWithoutCheckCallback(result_dst, result.Pass()); + LoadWithoutCheckCallback(result_dst, std::move(result)); } void GCMStoreImplTest::LoadWithoutCheckCallback( scoped_ptr<GCMStore::LoadResult>* result_dst, scoped_ptr<GCMStore::LoadResult> result) { - *result_dst = result.Pass(); + *result_dst = std::move(result); } void GCMStoreImplTest::UpdateCallback(bool success) { @@ -163,7 +163,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(kDeviceId, load_result->device_android_id); @@ -186,7 +186,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(last_checkin_time, load_result->last_checkin_time); ASSERT_EQ(accounts, load_result->last_checkin_accounts); @@ -198,7 +198,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(base::Time(), load_result->last_checkin_time); } @@ -220,7 +220,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(settings, load_result->gservices_settings); @@ -238,7 +238,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(settings, load_result->gservices_settings); @@ -266,7 +266,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(2u, load_result->registrations.size()); @@ -282,7 +282,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(1u, load_result->registrations.size()); @@ -307,7 +307,7 @@ PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(persistent_ids, load_result->incoming_messages); @@ -318,7 +318,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->incoming_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -347,7 +347,7 @@ PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_TRUE(load_result->incoming_messages.empty()); @@ -367,7 +367,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->outgoing_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -400,7 +400,7 @@ PumpLoop(); } - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(persistent_ids, load_result->incoming_messages); @@ -424,7 +424,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); load_result->incoming_messages.clear(); load_result->outgoing_messages.clear(); LoadGCMStore(gcm_store.get(), &load_result); @@ -467,7 +467,7 @@ } // Tear down and restore the database. - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); // Adding more messages should still fail. @@ -538,7 +538,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(2UL, load_result->account_mappings.size()); @@ -565,7 +565,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(1UL, load_result->account_mappings.size()); @@ -600,7 +600,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(2UL, load_result->heartbeat_intervals.size()); @@ -616,7 +616,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(1UL, load_result->heartbeat_intervals.size()); @@ -674,7 +674,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(last_token_fetch_time, load_result->last_token_fetch_time); @@ -685,7 +685,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); EXPECT_EQ(base::Time(), load_result->last_token_fetch_time); } @@ -709,7 +709,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(2u, load_result->instance_id_data.size()); @@ -725,7 +725,7 @@ base::Bind(&GCMStoreImplTest::UpdateCallback, base::Unretained(this))); PumpLoop(); - gcm_store = BuildGCMStore().Pass(); + gcm_store = BuildGCMStore(); LoadGCMStore(gcm_store.get(), &load_result); ASSERT_EQ(1u, load_result->instance_id_data.size());
diff --git a/google_apis/gcm/engine/heartbeat_manager.cc b/google_apis/gcm/engine/heartbeat_manager.cc index d7ec689..8ac70b8 100644 --- a/google_apis/gcm/engine/heartbeat_manager.cc +++ b/google_apis/gcm/engine/heartbeat_manager.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/heartbeat_manager.h" +#include <utility> + #include "base/callback.h" #include "base/location.h" #include "base/metrics/histogram.h" @@ -120,7 +122,7 @@ base::Closure timer_task(heartbeat_timer_->user_task()); heartbeat_timer_->Stop(); - heartbeat_timer_ = timer.Pass(); + heartbeat_timer_ = std::move(timer); if (was_running) heartbeat_timer_->Start(FROM_HERE, remaining_delay, timer_task);
diff --git a/google_apis/gcm/engine/mcs_client.cc b/google_apis/gcm/engine/mcs_client.cc index 9385451..dfa1f852 100644 --- a/google_apis/gcm/engine/mcs_client.cc +++ b/google_apis/gcm/engine/mcs_client.cc
@@ -5,8 +5,8 @@ #include "google_apis/gcm/engine/mcs_client.h" #include <stddef.h> - #include <set> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -334,7 +334,7 @@ ReliablePacketInfo* original_packet = collapse_key_map_[collapse_key]; DVLOG(1) << "Found matching collapse key, Reusing persistent id of " << original_packet->persistent_id; - original_packet->protobuf = packet_info->protobuf.Pass(); + original_packet->protobuf = std::move(packet_info->protobuf); SetPersistentId(original_packet->persistent_id, original_packet->protobuf.get()); gcm_store_->OverwriteOutgoingMessage( @@ -379,7 +379,7 @@ } void MCSClient::UpdateHeartbeatTimer(scoped_ptr<base::Timer> timer) { - heartbeat_manager_.UpdateHeartbeatTimer(timer.Pass()); + heartbeat_manager_.UpdateHeartbeatTimer(std::move(timer)); } void MCSClient::AddHeartbeatInterval(const std::string& scope, @@ -632,7 +632,7 @@ } if (send) { - SendMessage(MCSMessage(kDataMessageStanzaTag, response.Pass())); + SendMessage(MCSMessage(kDataMessageStanzaTag, std::move(response))); } } @@ -721,9 +721,8 @@ // Pass the login response on up. base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(message_received_callback_, - MCSMessage(tag, protobuf.Pass()))); + FROM_HERE, base::Bind(message_received_callback_, + MCSMessage(tag, std::move(protobuf)))); // If there are pending messages, attempt to send one. if (!to_send_.empty()) { @@ -786,15 +785,14 @@ mcs_proto::DataMessageStanza* data_message = reinterpret_cast<mcs_proto::DataMessageStanza*>(protobuf.get()); if (data_message->category() == kMCSCategory) { - HandleMCSDataMesssage(protobuf.Pass()); + HandleMCSDataMesssage(std::move(protobuf)); return; } DCHECK(protobuf.get()); base::ThreadTaskRunnerHandle::Get()->PostTask( - FROM_HERE, - base::Bind(message_received_callback_, - MCSMessage(tag, protobuf.Pass()))); + FROM_HERE, base::Bind(message_received_callback_, + MCSMessage(tag, std::move(protobuf)))); return; } default:
diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc index b1b29410..2c6b467 100644 --- a/google_apis/gcm/engine/mcs_client_unittest.cc +++ b/google_apis/gcm/engine/mcs_client_unittest.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -251,7 +252,7 @@ setting->set_value(base::IntToString(heartbeat_interval_ms)); } GetFakeHandler()->ExpectOutgoingMessage( - MCSMessage(kLoginRequestTag, login_request.Pass())); + MCSMessage(kLoginRequestTag, std::move(login_request))); } void MCSClientTest::StoreCredentials() { @@ -429,7 +430,7 @@ // Receive the ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(2); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); EXPECT_EQ(MCSClient::SENT, message_send_status()); @@ -491,7 +492,7 @@ // Receive the ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kMessageBatchSize + 1); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); // Reconnect and ensure no messages are resent. @@ -529,7 +530,7 @@ InitializeClient(); LoginClient(std::vector<std::string>()); scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(id_list)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); } @@ -575,7 +576,7 @@ GetFakeHandler()->ExpectOutgoingMessage(message); } scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(acked_ids)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -638,7 +639,7 @@ GetFakeHandler()->ExpectOutgoingMessage(cMessage3); std::vector<std::string> acked_ids(1, "1"); scoped_ptr<mcs_proto::IqStanza> ack(BuildSelectiveAck(acked_ids)); - GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ReceiveMessage(MCSMessage(kIqStanzaTag, std::move(ack))); WaitForMCSEvent(); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -725,7 +726,8 @@ // The stream ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kAckLimitSize + 1); - GetFakeHandler()->ExpectOutgoingMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ExpectOutgoingMessage( + MCSMessage(kIqStanzaTag, std::move(ack))); // Receive some messages. std::vector<std::string> id_list; @@ -749,10 +751,10 @@ new mcs_proto::HeartbeatAck()); heartbeat_ack->set_last_stream_id_received(kAckLimitSize + 2); GetFakeHandler()->ExpectOutgoingMessage( - MCSMessage(kHeartbeatAckTag, heartbeat_ack.Pass())); + MCSMessage(kHeartbeatAckTag, std::move(heartbeat_ack))); GetFakeHandler()->ReceiveMessage( - MCSMessage(kHeartbeatPingTag, heartbeat.Pass())); + MCSMessage(kHeartbeatPingTag, std::move(heartbeat))); PumpLoop(); EXPECT_TRUE(GetFakeHandler()->AllOutgoingMessagesReceived()); @@ -1154,7 +1156,8 @@ // The stream ack. scoped_ptr<mcs_proto::IqStanza> ack = BuildStreamAck(); ack->set_last_stream_id_received(kAckLimitSize - 1); - GetFakeHandler()->ExpectOutgoingMessage(MCSMessage(kIqStanzaTag, ack.Pass())); + GetFakeHandler()->ExpectOutgoingMessage( + MCSMessage(kIqStanzaTag, std::move(ack))); // Receive some messages. for (int i = 1; i < kAckLimitSize - 2; ++i) {
diff --git a/google_apis/gcm/engine/registration_request.cc b/google_apis/gcm/engine/registration_request.cc index c0ed642..4c80020 100644 --- a/google_apis/gcm/engine/registration_request.cc +++ b/google_apis/gcm/engine/registration_request.cc
@@ -5,6 +5,7 @@ #include "google_apis/gcm/engine/registration_request.h" #include <stddef.h> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -98,7 +99,7 @@ const std::string& source_to_record) : callback_(callback), request_info_(request_info), - custom_request_handler_(custom_request_handler.Pass()), + custom_request_handler_(std::move(custom_request_handler)), registration_url_(registration_url), backoff_entry_(&backoff_policy), request_context_getter_(request_context_getter),
diff --git a/google_apis/gcm/engine/registration_request_unittest.cc b/google_apis/gcm/engine/registration_request_unittest.cc index a4e10396..9a8ab01 100644 --- a/google_apis/gcm/engine/registration_request_unittest.cc +++ b/google_apis/gcm/engine/registration_request_unittest.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include <stdint.h> - #include <map> #include <string> +#include <utility> #include <vector> #include "base/strings/string_number_conversions.h" @@ -101,16 +101,11 @@ scoped_ptr<GCMRegistrationRequestHandler> request_handler( new GCMRegistrationRequestHandler(sender_ids)); request_.reset(new RegistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&RegistrationRequestTest::RegistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, - sender_ids)); + max_retry_count_, url_request_context_getter(), &recorder_, sender_ids)); } TEST_F(GCMRegistrationRequestTest, RequestSuccessful) { @@ -424,15 +419,11 @@ new InstanceIDGetTokenRequestHandler( instance_id, authorized_entity, scope, kGCMVersion, options)); request_.reset(new RegistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&RegistrationRequestTest::RegistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, + max_retry_count_, url_request_context_getter(), &recorder_, authorized_entity)); }
diff --git a/google_apis/gcm/engine/unregistration_request.cc b/google_apis/gcm/engine/unregistration_request.cc index 9e76807..a8115ec 100644 --- a/google_apis/gcm/engine/unregistration_request.cc +++ b/google_apis/gcm/engine/unregistration_request.cc
@@ -4,6 +4,8 @@ #include "google_apis/gcm/engine/unregistration_request.h" +#include <utility> + #include "base/bind.h" #include "base/location.h" #include "base/strings/string_number_conversions.h" @@ -61,7 +63,7 @@ const std::string& source_to_record) : callback_(callback), request_info_(request_info), - custom_request_handler_(custom_request_handler.Pass()), + custom_request_handler_(std::move(custom_request_handler)), registration_url_(registration_url), backoff_entry_(&backoff_policy), request_context_getter_(request_context_getter),
diff --git a/google_apis/gcm/engine/unregistration_request_unittest.cc b/google_apis/gcm/engine/unregistration_request_unittest.cc index 0b30678..138abd9d 100644 --- a/google_apis/gcm/engine/unregistration_request_unittest.cc +++ b/google_apis/gcm/engine/unregistration_request_unittest.cc
@@ -3,9 +3,9 @@ // found in the LICENSE file. #include <stdint.h> - #include <map> #include <string> +#include <utility> #include <vector> #include "base/strings/string_number_conversions.h" @@ -96,15 +96,11 @@ scoped_ptr<GCMUnregistrationRequestHandler> request_handler( new GCMUnregistrationRequestHandler(kAppId)); request_.reset(new UnregistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&UnregistrationRequestTest::UnregistrationCallback, base::Unretained(this)), - max_retry_count_, - url_request_context_getter(), - &recorder_, + max_retry_count_, url_request_context_getter(), &recorder_, std::string())); } @@ -349,15 +345,11 @@ new InstanceIDDeleteTokenRequestHandler( instance_id, authorized_entity, scope, kGCMVersion)); request_.reset(new UnregistrationRequest( - GURL(kRegistrationURL), - request_info, - request_handler.Pass(), + GURL(kRegistrationURL), request_info, std::move(request_handler), GetBackoffPolicy(), base::Bind(&UnregistrationRequestTest::UnregistrationCallback, base::Unretained(this)), - max_retry_count(), - url_request_context_getter(), - &recorder_, + max_retry_count(), url_request_context_getter(), &recorder_, std::string())); }
diff --git a/google_apis/gcm/tools/mcs_probe.cc b/google_apis/gcm/tools/mcs_probe.cc index 230d6a1..aafd4db 100644 --- a/google_apis/gcm/tools/mcs_probe.cc +++ b/google_apis/gcm/tools/mcs_probe.cc
@@ -6,10 +6,10 @@ // own. #include <stdint.h> - #include <cstddef> #include <cstdio> #include <string> +#include <utility> #include <vector> #include "base/at_exit.h" @@ -356,9 +356,8 @@ } mcs_client_->Initialize( base::Bind(&MCSProbe::ErrorCallback, base::Unretained(this)), - base::Bind(&MessageReceivedCallback), - base::Bind(&MessageSentCallback), - load_result.Pass()); + base::Bind(&MessageReceivedCallback), base::Bind(&MessageSentCallback), + std::move(load_result)); if (!android_id_ || !secret_) { DVLOG(1) << "Checkin to generate new MCS credentials."; @@ -386,7 +385,7 @@ logger_.reset(new net::WriteToFileNetLogObserver()); logger_->set_capture_mode( net::NetLogCaptureMode::IncludeCookiesAndCredentials()); - logger_->StartObserving(&net_log_, log_file.Pass(), nullptr, nullptr); + logger_->StartObserving(&net_log_, std::move(log_file), nullptr, nullptr); } host_resolver_ = net::HostResolver::CreateDefaultResolver(&net_log_); @@ -402,10 +401,8 @@ base::WorkerPool::GetTaskRunner(true))); transport_security_state_.reset(new net::TransportSecurityState()); - http_auth_handler_factory_ = - net::HttpAuthHandlerRegistryFactory::Create(&http_auth_preferences_, - host_resolver_.get()) - .Pass(); + http_auth_handler_factory_ = net::HttpAuthHandlerRegistryFactory::Create( + &http_auth_preferences_, host_resolver_.get()); http_server_properties_.reset(new net::HttpServerPropertiesImpl()); host_mapping_rules_.reset(new net::HostMappingRules()); proxy_service_ = net::ProxyService::CreateDirectWithNetLog(&net_log_);
diff --git a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc index d1d7e35..cc18157 100644 --- a/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.cc
@@ -5,6 +5,7 @@ #include "gpu/blink/webgraphicscontext3d_in_process_command_buffer_impl.h" #include <GLES2/gl2.h> +#include <utility> #ifndef GL_GLEXT_PROTOTYPES #define GL_GLEXT_PROTOTYPES 1 #endif @@ -68,16 +69,13 @@ bool lose_context_when_out_of_memory = false; // Not used. bool is_offscreen = true; // Not used. return make_scoped_ptr(new WebGraphicsContext3DInProcessCommandBufferImpl( - context.Pass(), - attributes, - lose_context_when_out_of_memory, - is_offscreen, - gfx::kNullAcceleratedWidget /* window. Not used. */)); + std::move(context), attributes, lose_context_when_out_of_memory, + is_offscreen, gfx::kNullAcceleratedWidget /* window. Not used. */)); } WebGraphicsContext3DInProcessCommandBufferImpl:: WebGraphicsContext3DInProcessCommandBufferImpl( - scoped_ptr< ::gpu::GLInProcessContext> context, + scoped_ptr<::gpu::GLInProcessContext> context, const blink::WebGraphicsContext3D::Attributes& attributes, bool lose_context_when_out_of_memory, bool is_offscreen, @@ -85,7 +83,7 @@ : share_resources_(attributes.shareResources), is_offscreen_(is_offscreen), window_(window), - context_(context.Pass()) { + context_(std::move(context)) { ConvertAttributes(attributes, &attribs_); attribs_.lose_context_when_out_of_memory = lose_context_when_out_of_memory; }
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 3e60321..84fee6c 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -6453,6 +6453,7 @@ glGetRenderbufferParameterivEXT(target, GL_RENDERBUFFER_SAMPLES_EXT, params); } + break; default: glGetRenderbufferParameterivEXT(target, pname, params); break;
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 303f55342e..5e70261 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/compiler_specific.h" @@ -359,7 +360,7 @@ const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) { scoped_ptr<ChannelProxy> channel(new ChannelProxy(listener, ipc_task_runner)); channel->Init(channel_handle, mode, true); - return channel.Pass(); + return channel; } // static @@ -368,8 +369,8 @@ Listener* listener, const scoped_refptr<base::SingleThreadTaskRunner>& ipc_task_runner) { scoped_ptr<ChannelProxy> channel(new ChannelProxy(listener, ipc_task_runner)); - channel->Init(factory.Pass(), true); - return channel.Pass(); + channel->Init(std::move(factory), true); + return channel; } ChannelProxy::ChannelProxy(Context* context) @@ -420,7 +421,7 @@ // low-level pipe so that the client can connect. Without creating // the pipe immediately, it is possible for a listener to attempt // to connect and get an error since the pipe doesn't exist yet. - context_->CreateChannel(factory.Pass()); + context_->CreateChannel(std::move(factory)); } else { context_->ipc_task_runner()->PostTask( FROM_HERE, base::Bind(&Context::CreateChannel, context_.get(),
diff --git a/ipc/ipc_sync_channel.cc b/ipc/ipc_sync_channel.cc index 8e559146..d194211 100644 --- a/ipc/ipc_sync_channel.cc +++ b/ipc/ipc_sync_channel.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/lazy_instance.h" @@ -416,7 +417,7 @@ scoped_ptr<SyncChannel> channel = Create(listener, ipc_task_runner, shutdown_event); channel->Init(channel_handle, mode, create_pipe_now); - return channel.Pass(); + return channel; } // static @@ -428,8 +429,8 @@ base::WaitableEvent* shutdown_event) { scoped_ptr<SyncChannel> channel = Create(listener, ipc_task_runner, shutdown_event); - channel->Init(factory.Pass(), create_pipe_now); - return channel.Pass(); + channel->Init(std::move(factory), create_pipe_now); + return channel; } // static
diff --git a/ipc/ipc_test_base.cc b/ipc/ipc_test_base.cc index f700856f..6243138 100644 --- a/ipc/ipc_test_base.cc +++ b/ipc/ipc_test_base.cc
@@ -2,15 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "build/build_config.h" - -#include "base/single_thread_task_runner.h" #include "ipc/ipc_test_base.h" +#include <utility> + #include "base/command_line.h" #include "base/process/kill.h" +#include "base/single_thread_task_runner.h" #include "base/threading/thread.h" #include "base/time/time.h" +#include "build/build_config.h" #include "ipc/ipc_descriptors.h" #if defined(OS_POSIX) @@ -48,7 +49,7 @@ DCHECK(!message_loop_); test_client_name_ = test_client_name; - message_loop_ = message_loop.Pass(); + message_loop_ = std::move(message_loop); } void IPCTestBase::CreateChannel(IPC::Listener* listener) { @@ -61,11 +62,11 @@ } scoped_ptr<IPC::Channel> IPCTestBase::ReleaseChannel() { - return channel_.Pass(); + return std::move(channel_); } void IPCTestBase::SetChannel(scoped_ptr<IPC::Channel> channel) { - channel_ = channel.Pass(); + channel_ = std::move(channel); }
diff --git a/ipc/mojo/ipc_channel_mojo.cc b/ipc/mojo/ipc_channel_mojo.cc index d0356eb..404c8145 100644 --- a/ipc/mojo/ipc_channel_mojo.cc +++ b/ipc/mojo/ipc_channel_mojo.cc
@@ -6,8 +6,8 @@ #include <stddef.h> #include <stdint.h> - #include <memory> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -76,13 +76,17 @@ void OnPipeAvailable(mojo::embedder::ScopedPlatformHandle handle, int32_t peer_pid) override { if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) { - InitMessageReader(mojo::embedder::CreateChannel( - handle.Pass(), base::Callback<void(mojo::embedder::ChannelInfo*)>(), - scoped_refptr<base::TaskRunner>()), peer_pid); + InitMessageReader( + mojo::embedder::CreateChannel( + std::move(handle), + base::Callback<void(mojo::embedder::ChannelInfo*)>(), + scoped_refptr<base::TaskRunner>()), + peer_pid); return; } - CreateMessagingPipe(handle.Pass(), base::Bind(&ClientChannelMojo::BindPipe, - weak_factory_.GetWeakPtr())); + CreateMessagingPipe( + std::move(handle), + base::Bind(&ClientChannelMojo::BindPipe, weak_factory_.GetWeakPtr())); } // ClientChannel implementation @@ -90,13 +94,13 @@ mojo::ScopedMessagePipeHandle pipe, int32_t peer_pid, const mojo::Callback<void(int32_t)>& callback) override { - InitMessageReader(pipe.Pass(), static_cast<base::ProcessId>(peer_pid)); + InitMessageReader(std::move(pipe), static_cast<base::ProcessId>(peer_pid)); callback.Run(GetSelfPID()); } private: void BindPipe(mojo::ScopedMessagePipeHandle handle) { - binding_.Bind(handle.Pass()); + binding_.Bind(std::move(handle)); } void OnConnectionError() { listener()->OnChannelError(); @@ -127,14 +131,15 @@ int32_t peer_pid) override { if (base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk")) { message_pipe_ = mojo::embedder::CreateChannel( - handle.Pass(), base::Callback<void(mojo::embedder::ChannelInfo*)>(), + std::move(handle), + base::Callback<void(mojo::embedder::ChannelInfo*)>(), scoped_refptr<base::TaskRunner>()); if (!message_pipe_.is_valid()) { LOG(WARNING) << "mojo::CreateMessagePipe failed: "; listener()->OnChannelError(); return; } - InitMessageReader(message_pipe_.Pass(), peer_pid); + InitMessageReader(std::move(message_pipe_), peer_pid); return; } @@ -147,7 +152,7 @@ return; } CreateMessagingPipe( - handle.Pass(), + std::move(handle), base::Bind(&ServerChannelMojo::InitClientChannel, weak_factory_.GetWeakPtr(), base::Passed(&peer))); } @@ -162,11 +167,11 @@ void InitClientChannel(mojo::ScopedMessagePipeHandle peer_handle, mojo::ScopedMessagePipeHandle handle) { client_channel_.Bind( - mojo::InterfacePtrInfo<ClientChannel>(handle.Pass(), 0u)); + mojo::InterfacePtrInfo<ClientChannel>(std::move(handle), 0u)); client_channel_.set_connection_error_handler(base::Bind( &ServerChannelMojo::OnConnectionError, base::Unretained(this))); client_channel_->Init( - peer_handle.Pass(), static_cast<int32_t>(GetSelfPID()), + std::move(peer_handle), static_cast<int32_t>(GetSelfPID()), base::Bind(&ServerChannelMojo::ClientChannelWasInitialized, base::Unretained(this))); } @@ -177,7 +182,7 @@ // ClientChannelClient implementation void ClientChannelWasInitialized(int32_t peer_pid) { - InitMessageReader(message_pipe_.Pass(), peer_pid); + InitMessageReader(std::move(message_pipe_), peer_pid); } mojo::InterfacePtr<ClientChannel> client_channel_; @@ -300,8 +305,9 @@ weak_factory_.GetWeakPtr(), callback); if (!g_use_channel_on_io_thread_only || base::ThreadTaskRunnerHandle::Get() == io_runner_) { - CreateMessagingPipeOnIOThread( - handle.Pass(), base::ThreadTaskRunnerHandle::Get(), return_callback); + CreateMessagingPipeOnIOThread(std::move(handle), + base::ThreadTaskRunnerHandle::Get(), + return_callback); } else { io_runner_->PostTask( FROM_HERE, @@ -318,9 +324,9 @@ const CreateMessagingPipeOnIOThreadCallback& callback) { mojo::embedder::ChannelInfo* channel_info; mojo::ScopedMessagePipeHandle pipe = - mojo::embedder::CreateChannelOnIOThread(handle.Pass(), &channel_info); + mojo::embedder::CreateChannelOnIOThread(std::move(handle), &channel_info); if (base::ThreadTaskRunnerHandle::Get() == callback_runner) { - callback.Run(pipe.Pass(), channel_info); + callback.Run(std::move(pipe), channel_info); } else { callback_runner->PostTask( FROM_HERE, base::Bind(callback, base::Passed(&pipe), channel_info)); @@ -334,7 +340,7 @@ DCHECK(!channel_info_.get()); channel_info_ = scoped_ptr<mojo::embedder::ChannelInfo, ChannelInfoDeleter>( channel_info, ChannelInfoDeleter(io_runner_)); - callback.Run(handle.Pass()); + callback.Run(std::move(handle)); } bool ChannelMojo::Connect() { @@ -349,7 +355,7 @@ // |message_reader_| has to be cleared inside the lock, // but the instance has to be deleted outside. base::AutoLock l(lock_); - to_be_deleted = message_reader_.Pass(); + to_be_deleted = std::move(message_reader_); // We might Close() before we Connect(). waiting_connect_ = false; } @@ -381,7 +387,7 @@ void ChannelMojo::InitMessageReader(mojo::ScopedMessagePipeHandle pipe, int32_t peer_pid) { scoped_ptr<internal::MessagePipeReader, ClosingDeleter> reader( - new internal::MessagePipeReader(pipe.Pass(), this)); + new internal::MessagePipeReader(std::move(pipe), this)); { base::AutoLock l(lock_);
diff --git a/ipc/mojo/ipc_channel_mojo_unittest.cc b/ipc/mojo/ipc_channel_mojo_unittest.cc index 37267eb..b4f4154 100644 --- a/ipc/mojo/ipc_channel_mojo_unittest.cc +++ b/ipc/mojo/ipc_channel_mojo_unittest.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/base_paths.h" #include "base/files/file.h" @@ -316,8 +317,8 @@ mojo::WriteMessageRaw(pipe->self.get(), &content[0], static_cast<uint32_t>(content.size()), nullptr, 0, 0)); - EXPECT_TRUE( - IPC::MojoMessageHelper::WriteMessagePipeTo(message, pipe->peer.Pass())); + EXPECT_TRUE(IPC::MojoMessageHelper::WriteMessagePipeTo( + message, std::move(pipe->peer))); } static void WritePipeThenSend(IPC::Sender* sender, TestingMessagePipe* pipe) {
diff --git a/ipc/mojo/ipc_message_pipe_reader.cc b/ipc/mojo/ipc_message_pipe_reader.cc index 11aab8d..19d9e30 100644 --- a/ipc/mojo/ipc_message_pipe_reader.cc +++ b/ipc/mojo/ipc_message_pipe_reader.cc
@@ -5,6 +5,7 @@ #include "ipc/mojo/ipc_message_pipe_reader.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -20,14 +21,12 @@ MessagePipeReader::MessagePipeReader(mojo::ScopedMessagePipeHandle handle, MessagePipeReader::Delegate* delegate) - : pipe_(handle.Pass()), + : pipe_(std::move(handle)), handle_copy_(pipe_.get().value()), delegate_(delegate), - async_waiter_( - new AsyncHandleWaiter(base::Bind(&MessagePipeReader::PipeIsReady, - base::Unretained(this)))), - pending_send_error_(MOJO_RESULT_OK) { -} + async_waiter_(new AsyncHandleWaiter( + base::Bind(&MessagePipeReader::PipeIsReady, base::Unretained(this)))), + pending_send_error_(MOJO_RESULT_OK) {} MessagePipeReader::~MessagePipeReader() { DCHECK(thread_checker_.CalledOnValidThread());
diff --git a/ipc/mojo/ipc_mojo_bootstrap.cc b/ipc/mojo/ipc_mojo_bootstrap.cc index fe307d5..d296675 100644 --- a/ipc/mojo/ipc_mojo_bootstrap.cc +++ b/ipc/mojo/ipc_mojo_bootstrap.cc
@@ -5,6 +5,7 @@ #include "ipc/mojo/ipc_mojo_bootstrap.h" #include <stdint.h> +#include <utility> #include "base/logging.h" #include "base/macros.h" @@ -164,8 +165,8 @@ scoped_ptr<Channel> bootstrap_channel = Channel::Create(handle, mode, self.get()); - self->Init(bootstrap_channel.Pass(), delegate); - return self.Pass(); + self->Init(std::move(bootstrap_channel), delegate); + return self; } MojoBootstrap::MojoBootstrap() : delegate_(NULL), state_(STATE_INITIALIZED) { @@ -175,7 +176,7 @@ } void MojoBootstrap::Init(scoped_ptr<Channel> channel, Delegate* delegate) { - channel_ = channel.Pass(); + channel_ = std::move(channel); delegate_ = delegate; }
diff --git a/ipc/mojo/ipc_mojo_handle_attachment.cc b/ipc/mojo/ipc_mojo_handle_attachment.cc index 4bbcf82..70b80c5 100644 --- a/ipc/mojo/ipc_mojo_handle_attachment.cc +++ b/ipc/mojo/ipc_mojo_handle_attachment.cc
@@ -4,6 +4,8 @@ #include "ipc/mojo/ipc_mojo_handle_attachment.h" +#include <utility> + #include "build/build_config.h" #include "ipc/ipc_message_attachment_set.h" #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" @@ -12,8 +14,7 @@ namespace internal { MojoHandleAttachment::MojoHandleAttachment(mojo::ScopedHandle handle) - : handle_(handle.Pass()) { -} + : handle_(std::move(handle)) {} MojoHandleAttachment::~MojoHandleAttachment() { } @@ -38,7 +39,7 @@ #endif // OS_POSIX mojo::ScopedHandle MojoHandleAttachment::TakeHandle() { - return handle_.Pass(); + return std::move(handle_); } } // namespace internal
diff --git a/ipc/mojo/ipc_mojo_message_helper.cc b/ipc/mojo/ipc_mojo_message_helper.cc index 6f33f80f..8b8344e 100644 --- a/ipc/mojo/ipc_mojo_message_helper.cc +++ b/ipc/mojo/ipc_mojo_message_helper.cc
@@ -4,6 +4,8 @@ #include "ipc/mojo/ipc_mojo_message_helper.h" +#include <utility> + #include "ipc/mojo/ipc_mojo_handle_attachment.h" namespace IPC { @@ -13,7 +15,7 @@ Message* message, mojo::ScopedMessagePipeHandle handle) { message->WriteAttachment(new internal::MojoHandleAttachment( - mojo::ScopedHandle::From(handle.Pass()))); + mojo::ScopedHandle::From(std::move(handle)))); return true; }
diff --git a/jingle/glue/chrome_async_socket.cc b/jingle/glue/chrome_async_socket.cc index 6509f4c5..52b35b52 100644 --- a/jingle/glue/chrome_async_socket.cc +++ b/jingle/glue/chrome_async_socket.cc
@@ -5,10 +5,10 @@ #include "jingle/glue/chrome_async_socket.h" #include <stddef.h> - #include <algorithm> #include <cstdlib> #include <cstring> +#include <utility> #include "base/bind.h" #include "base/compiler_specific.h" @@ -405,10 +405,9 @@ DCHECK(transport_socket_.get()); scoped_ptr<net::ClientSocketHandle> socket_handle( new net::ClientSocketHandle()); - socket_handle->SetSocket(transport_socket_.Pass()); - transport_socket_ = - resolving_client_socket_factory_->CreateSSLClientSocket( - socket_handle.Pass(), net::HostPortPair(domain_name, 443)); + socket_handle->SetSocket(std::move(transport_socket_)); + transport_socket_ = resolving_client_socket_factory_->CreateSSLClientSocket( + std::move(socket_handle), net::HostPortPair(domain_name, 443)); int status = transport_socket_->Connect( base::Bind(&ChromeAsyncSocket::ProcessSSLConnectDone, weak_ptr_factory_.GetWeakPtr()));
diff --git a/jingle/glue/chrome_async_socket_unittest.cc b/jingle/glue/chrome_async_socket_unittest.cc index 79fdb68..fd8193da 100644 --- a/jingle/glue/chrome_async_socket_unittest.cc +++ b/jingle/glue/chrome_async_socket_unittest.cc
@@ -5,9 +5,9 @@ #include "jingle/glue/chrome_async_socket.h" #include <stddef.h> - #include <deque> #include <string> +#include <utility> #include "base/logging.h" #include "base/macros.h" @@ -137,7 +137,7 @@ context.cert_verifier = cert_verifier_.get(); context.transport_security_state = transport_security_state_.get(); return mock_client_socket_factory_->CreateSSLClientSocket( - transport_socket.Pass(), host_and_port, ssl_config_, context); + std::move(transport_socket), host_and_port, ssl_config_, context); } private: @@ -161,7 +161,7 @@ // when called. // Explicitly create a MessagePumpDefault which can run in this enivronment. scoped_ptr<base::MessagePump> pump(new base::MessagePumpDefault()); - message_loop_.reset(new base::MessageLoop(pump.Pass())); + message_loop_.reset(new base::MessageLoop(std::move(pump))); } ~ChromeAsyncSocketTest() override {}
diff --git a/jingle/glue/fake_ssl_client_socket.cc b/jingle/glue/fake_ssl_client_socket.cc index 3284f8c..a61d359 100644 --- a/jingle/glue/fake_ssl_client_socket.cc +++ b/jingle/glue/fake_ssl_client_socket.cc
@@ -6,8 +6,8 @@ #include <stddef.h> #include <stdint.h> - #include <cstdlib> +#include <utility> #include "base/compiler_specific.h" #include "base/logging.h" @@ -81,7 +81,7 @@ FakeSSLClientSocket::FakeSSLClientSocket( scoped_ptr<net::StreamSocket> transport_socket) - : transport_socket_(transport_socket.Pass()), + : transport_socket_(std::move(transport_socket)), next_handshake_state_(STATE_NONE), handshake_completed_(false), write_buf_(NewDrainableIOBufferWithSize(arraysize(kSslClientHello))),
diff --git a/jingle/glue/fake_ssl_client_socket_unittest.cc b/jingle/glue/fake_ssl_client_socket_unittest.cc index c3d64fd..50f7457 100644 --- a/jingle/glue/fake_ssl_client_socket_unittest.cc +++ b/jingle/glue/fake_ssl_client_socket_unittest.cc
@@ -6,8 +6,8 @@ #include <stddef.h> #include <stdint.h> - #include <algorithm> +#include <utility> #include <vector> #include "base/macros.h" @@ -291,7 +291,7 @@ EXPECT_CALL(*mock_client_socket, SetOmniboxSpeculation()); // Takes ownership of |mock_client_socket|. - FakeSSLClientSocket fake_ssl_client_socket(mock_client_socket.Pass()); + FakeSSLClientSocket fake_ssl_client_socket(std::move(mock_client_socket)); fake_ssl_client_socket.SetReceiveBufferSize(kReceiveBufferSize); fake_ssl_client_socket.SetSendBufferSize(kSendBufferSize); EXPECT_EQ(kPeerAddress,
diff --git a/jingle/glue/thread_wrapper.cc b/jingle/glue/thread_wrapper.cc index b035dbe..5dcf996 100644 --- a/jingle/glue/thread_wrapper.cc +++ b/jingle/glue/thread_wrapper.cc
@@ -51,7 +51,7 @@ scoped_ptr<JingleThreadWrapper> result(new JingleThreadWrapper(task_runner)); g_jingle_thread_wrapper.Get().Set(result.get()); - return result.Pass(); + return result; } // static
diff --git a/jingle/glue/xmpp_client_socket_factory.cc b/jingle/glue/xmpp_client_socket_factory.cc index 4f7ac4c..8255aa3 100644 --- a/jingle/glue/xmpp_client_socket_factory.cc +++ b/jingle/glue/xmpp_client_socket_factory.cc
@@ -4,6 +4,8 @@ #include "jingle/glue/xmpp_client_socket_factory.h" +#include <utility> + #include "base/logging.h" #include "jingle/glue/fake_ssl_client_socket.h" #include "jingle/glue/proxy_resolving_client_socket.h" @@ -39,10 +41,10 @@ request_context_getter_, ssl_config_, host_and_port)); - return (use_fake_ssl_client_socket_ ? - scoped_ptr<net::StreamSocket>( - new FakeSSLClientSocket(transport_socket.Pass())) : - transport_socket.Pass()); + return (use_fake_ssl_client_socket_ + ? scoped_ptr<net::StreamSocket>( + new FakeSSLClientSocket(std::move(transport_socket))) + : std::move(transport_socket)); } scoped_ptr<net::SSLClientSocket> @@ -58,7 +60,7 @@ // TODO(rkn): context.channel_id_service is NULL because the // ChannelIDService class is not thread safe. return client_socket_factory_->CreateSSLClientSocket( - transport_socket.Pass(), host_and_port, ssl_config_, context); + std::move(transport_socket), host_and_port, ssl_config_, context); }
diff --git a/jingle/notifier/base/xmpp_connection_unittest.cc b/jingle/notifier/base/xmpp_connection_unittest.cc index 56afc484..0e8266f 100644 --- a/jingle/notifier/base/xmpp_connection_unittest.cc +++ b/jingle/notifier/base/xmpp_connection_unittest.cc
@@ -5,6 +5,7 @@ #include "jingle/notifier/base/xmpp_connection.h" #include <string> +#include <utility> #include <vector> #include "base/memory/ref_counted.h" @@ -76,7 +77,7 @@ XmppConnectionTest() : mock_pre_xmpp_auth_(new MockPreXmppAuth()) { scoped_ptr<base::MessagePump> pump(new base::MessagePumpDefault()); - message_loop_.reset(new base::MessageLoop(pump.Pass())); + message_loop_.reset(new base::MessageLoop(std::move(pump))); url_request_context_getter_ = new net::TestURLRequestContextGetter( message_loop_->task_runner());
diff --git a/mash/example/window_type_launcher/main.cc b/mash/example/window_type_launcher/main.cc index f22a09ee..826820a 100644 --- a/mash/example/window_type_launcher/main.cc +++ b/mash/example/window_type_launcher/main.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug/stack_trace.h" @@ -69,7 +71,7 @@ &application_request, mojo::ScopedMessagePipeHandle())); base::MessageLoop loop(mojo::common::MessagePumpMojo::Create()); WindowTypeLauncher delegate; - mojo::ApplicationImpl impl(&delegate, application_request.Pass()); + mojo::ApplicationImpl impl(&delegate, std::move(application_request)); loop.Run(); mojo::embedder::ShutdownIPCSupport();
diff --git a/mash/wm/accelerator_registrar_impl.cc b/mash/wm/accelerator_registrar_impl.cc index ffe171f..1b9da28 100644 --- a/mash/wm/accelerator_registrar_impl.cc +++ b/mash/wm/accelerator_registrar_impl.cc
@@ -5,6 +5,7 @@ #include "mash/wm/accelerator_registrar_impl.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "components/mus/public/interfaces/window_tree_host.mojom.h" @@ -22,7 +23,7 @@ mojo::InterfaceRequest<AcceleratorRegistrar> request, const DestroyCallback& destroy_callback) : host_(host), - binding_(this, request.Pass()), + binding_(this, std::move(request)), accelerator_namespace_(accelerator_namespace & 0xffff), destroy_callback_(destroy_callback) { binding_.set_connection_error_handler(base::Bind( @@ -43,7 +44,7 @@ mus::mojom::EventPtr event) { DCHECK(OwnsAccelerator(accelerator_id)); accelerator_handler_->OnAccelerator(accelerator_id & kAcceleratorIdMask, - event.Pass()); + std::move(event)); } uint32_t AcceleratorRegistrarImpl::ComputeAcceleratorId( @@ -75,7 +76,7 @@ void AcceleratorRegistrarImpl::SetHandler( mus::mojom::AcceleratorHandlerPtr handler) { - accelerator_handler_ = handler.Pass(); + accelerator_handler_ = std::move(handler); accelerator_handler_.set_connection_error_handler(base::Bind( &AcceleratorRegistrarImpl::OnHandlerGone, base::Unretained(this))); } @@ -92,7 +93,8 @@ } uint32_t namespaced_accelerator_id = ComputeAcceleratorId(accelerator_id); accelerator_ids_.insert(namespaced_accelerator_id); - host_->AddAccelerator(namespaced_accelerator_id, matcher.Pass(), callback); + host_->AddAccelerator(namespaced_accelerator_id, std::move(matcher), + callback); } void AcceleratorRegistrarImpl::RemoveAccelerator(uint32_t accelerator_id) {
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc index 2aef460..414de00 100644 --- a/mash/wm/window_manager_application.cc +++ b/mash/wm/window_manager_application.cc
@@ -5,6 +5,7 @@ #include "mash/wm/window_manager_application.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "components/mus/common/util.h" @@ -82,8 +83,8 @@ mojo::GetProxy(&window_manager))); mus::mojom::WindowTreeHostClientPtr host_client; host_client_binding_.Bind(GetProxy(&host_client)); - mus::CreateSingleWindowTreeHost(app, host_client.Pass(), this, - &window_tree_host_, window_manager.Pass(), + mus::CreateSingleWindowTreeHost(app, std::move(host_client), this, + &window_tree_host_, std::move(window_manager), window_manager_.get()); } @@ -103,7 +104,7 @@ default: for (auto* registrar : accelerator_registrars_) { if (registrar->OwnsAccelerator(id)) { - registrar->ProcessAccelerator(id, event.Pass()); + registrar->ProcessAccelerator(id, std::move(event)); break; } } @@ -132,7 +133,8 @@ window_manager_->Initialize(this); for (auto request : requests_) - window_manager_binding_.AddBinding(window_manager_.get(), request->Pass()); + window_manager_binding_.AddBinding(window_manager_.get(), + std::move(*request)); requests_.clear(); shadow_controller_.reset(new ShadowController(root->connection())); @@ -158,7 +160,8 @@ accelerator_registrar_count = 0; } accelerator_registrars_.insert(new AcceleratorRegistrarImpl( - window_tree_host_.get(), ++accelerator_registrar_count, request.Pass(), + window_tree_host_.get(), ++accelerator_registrar_count, + std::move(request), base::Bind(&WindowManagerApplication::OnAcceleratorRegistrarDestroyed, base::Unretained(this)))); } @@ -167,10 +170,11 @@ mojo::ApplicationConnection* connection, mojo::InterfaceRequest<mus::mojom::WindowManager> request) { if (root_) { - window_manager_binding_.AddBinding(window_manager_.get(), request.Pass()); + window_manager_binding_.AddBinding(window_manager_.get(), + std::move(request)); } else { - requests_.push_back( - new mojo::InterfaceRequest<mus::mojom::WindowManager>(request.Pass())); + requests_.push_back(new mojo::InterfaceRequest<mus::mojom::WindowManager>( + std::move(request))); } }
diff --git a/mash/wm/window_manager_apptest.cc b/mash/wm/window_manager_apptest.cc index 54b6dfb..ddb9566 100644 --- a/mash/wm/window_manager_apptest.cc +++ b/mash/wm/window_manager_apptest.cc
@@ -3,6 +3,7 @@ // found in the LICENSE file. #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -34,9 +35,10 @@ window_tree_client_request = GetProxy(&window_tree_client); mojo::Map<mojo::String, mojo::Array<uint8_t>> properties; properties.mark_non_null(); - window_manager->OpenWindow(window_tree_client.Pass(), properties.Pass()); + window_manager->OpenWindow(std::move(window_tree_client), + std::move(properties)); mus::WindowTreeConnection* connection = mus::WindowTreeConnection::Create( - this, window_tree_client_request.Pass(), + this, std::move(window_tree_client_request), mus::WindowTreeConnection::CreateType::WAIT_FOR_EMBED); return connection->GetRoot(); }
diff --git a/mash/wm/window_manager_impl.cc b/mash/wm/window_manager_impl.cc index eaa559d..bc664a9b 100644 --- a/mash/wm/window_manager_impl.cc +++ b/mash/wm/window_manager_impl.cc
@@ -5,6 +5,7 @@ #include "mash/wm/window_manager_impl.h" #include <stdint.h> +#include <utility> #include "components/mus/common/types.h" #include "components/mus/public/cpp/property_type_converters.h" @@ -115,7 +116,7 @@ mojom::Container container = GetRequestedContainer(child_window); state_->GetWindowForContainer(container)->AddChild(child_window); - child_window->Embed(client.Pass()); + child_window->Embed(std::move(client)); if (provide_non_client_frame) { // NonClientFrameController deletes itself when |child_window| is destroyed. @@ -153,7 +154,7 @@ config->max_title_bar_button_width = NonClientFrameController::GetMaxTitleBarButtonWidth(); - callback.Run(config.Pass()); + callback.Run(std::move(config)); } bool WindowManagerImpl::OnWmSetBounds(mus::Window* window, gfx::Rect* bounds) {
diff --git a/printing/pdf_metafile_skia.cc b/printing/pdf_metafile_skia.cc index e68c0cf..04a8c40f 100644 --- a/printing/pdf_metafile_skia.cc +++ b/printing/pdf_metafile_skia.cc
@@ -300,10 +300,10 @@ scoped_ptr<PdfMetafileSkia> metafile(new PdfMetafileSkia); if (data_->pages_.size() == 0) - return metafile.Pass(); + return metafile; if (data_->recorder_.getRecordingCanvas()) // page outstanding - return metafile.Pass(); + return metafile; const Page& page = data_->pages_.back(); @@ -312,7 +312,7 @@ if (!metafile->FinishDocument()) // Generate PDF. metafile.reset(); - return metafile.Pass(); + return metafile; } } // namespace printing
diff --git a/printing/printed_document.cc b/printing/printed_document.cc index c231bef..472ebd5 100644 --- a/printing/printed_document.cc +++ b/printing/printed_document.cc
@@ -7,6 +7,7 @@ #include <algorithm> #include <set> #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -118,8 +119,8 @@ const gfx::Rect& page_rect) { // Notice the page_number + 1, the reason is that this is the value that will // be shown. Users dislike 0-based counting. - scoped_refptr<PrintedPage> page( - new PrintedPage(page_number + 1, metafile.Pass(), paper_size, page_rect)); + scoped_refptr<PrintedPage> page(new PrintedPage( + page_number + 1, std::move(metafile), paper_size, page_rect)); #if defined(OS_WIN) page->set_shrink_factor(shrink); #endif // OS_WIN
diff --git a/printing/printed_page.cc b/printing/printed_page.cc index 998f8be5..2c3e7e8 100644 --- a/printing/printed_page.cc +++ b/printing/printed_page.cc
@@ -4,6 +4,8 @@ #include "printing/printed_page.h" +#include <utility> + namespace printing { PrintedPage::PrintedPage(int page_number, @@ -11,7 +13,7 @@ const gfx::Size& page_size, const gfx::Rect& page_content_rect) : page_number_(page_number), - metafile_(metafile.Pass()), + metafile_(std::move(metafile)), #if defined(OS_WIN) shrink_factor_(0.0f), #endif // OS_WIN
diff --git a/remoting/host/DEPS b/remoting/host/DEPS index 3abc8545..052a0c5c 100644 --- a/remoting/host/DEPS +++ b/remoting/host/DEPS
@@ -10,7 +10,6 @@ "+remoting/signaling", "+remoting/tools", "+third_party/jsoncpp", - "+third_party/modp_b64", "+third_party/skia", "+third_party/webrtc", "+ui",
diff --git a/remoting/host/mac/me2me_preference_pane.mm b/remoting/host/mac/me2me_preference_pane.mm index de33b8bf..ab020bdf 100644 --- a/remoting/host/mac/me2me_preference_pane.mm +++ b/remoting/host/mac/me2me_preference_pane.mm
@@ -21,11 +21,11 @@ #include "base/posix/eintr_wrapper.h" #include "remoting/host/constants_mac.h" #include "remoting/host/host_config.h" +#include "remoting/host/pin_hash.h" #import "remoting/host/mac/me2me_preference_pane_confirm_pin.h" #import "remoting/host/mac/me2me_preference_pane_disable.h" #include "third_party/jsoncpp/source/include/json/reader.h" #include "third_party/jsoncpp/source/include/json/writer.h" -#include "third_party/modp_b64/modp_b64.h" namespace { @@ -46,51 +46,6 @@ config->GetString(remoting::kXmppLoginConfigPath, &value)); } -bool IsPinValid(const std::string& pin, const std::string& host_id, - const std::string& host_secret_hash) { - // TODO(lambroslambrou): Once the "base" target supports building for 64-bit - // on Mac OS X, remove this code and replace it with |VerifyHostPinHash()| - // from host/pin_hash.h. - size_t separator = host_secret_hash.find(':'); - if (separator == std::string::npos) - return false; - - std::string method = host_secret_hash.substr(0, separator); - if (method != "hmac") { - NSLog(@"Authentication method '%s' not supported", method.c_str()); - return false; - } - - std::string hash_base64 = host_secret_hash.substr(separator + 1); - - // Convert |hash_base64| to |hash|, based on code from base/base64.cc. - int hash_base64_size = static_cast<int>(hash_base64.size()); - std::string hash; - hash.resize(modp_b64_decode_len(hash_base64_size)); - - // modp_b64_decode_len() returns at least 1, so hash[0] is safe here. - int hash_size = modp_b64_decode(&(hash[0]), hash_base64.data(), - hash_base64_size); - if (hash_size < 0) { - NSLog(@"Failed to parse host_secret_hash"); - return false; - } - hash.resize(hash_size); - - std::string computed_hash; - computed_hash.resize(CC_SHA256_DIGEST_LENGTH); - - CCHmac(kCCHmacAlgSHA256, - host_id.data(), host_id.size(), - pin.data(), pin.size(), - &(computed_hash[0])); - - // Normally, a constant-time comparison function would be used, but it is - // unnecessary here as the "secret" is already readable by the user - // supplying input to this routine. - return computed_hash == hash; -} - } // namespace // These methods are copied from base/mac, but with the logging changed to use @@ -341,7 +296,7 @@ [self showError]; return; } - if (!IsPinValid(pin_utf8, host_id, host_secret_hash)) { + if (!remoting::VerifyHostPinHash(pin_utf8, host_id, host_secret_hash)) { [self showIncorrectPinMessage]; return; }
diff --git a/remoting/host/video_frame_recorder_host_extension.cc b/remoting/host/video_frame_recorder_host_extension.cc index 0ee1a525..f803d157 100644 --- a/remoting/host/video_frame_recorder_host_extension.cc +++ b/remoting/host/video_frame_recorder_host_extension.cc
@@ -4,6 +4,8 @@ #include "remoting/host/video_frame_recorder_host_extension.h" +#include <utility> + #include "base/base64.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" @@ -64,7 +66,7 @@ void VideoFrameRecorderHostExtensionSession::OnCreateVideoEncoder( scoped_ptr<VideoEncoder>* encoder) { video_frame_recorder_.DetachVideoEncoderWrapper(); - *encoder = video_frame_recorder_.WrapVideoEncoder(encoder->Pass()); + *encoder = video_frame_recorder_.WrapVideoEncoder(std::move(*encoder)); } bool VideoFrameRecorderHostExtensionSession::ModifiesVideoPipeline() const {
diff --git a/remoting/remoting_host_mac.gypi b/remoting/remoting_host_mac.gypi index dce3cf08..fb03e282 100644 --- a/remoting/remoting_host_mac.gypi +++ b/remoting/remoting_host_mac.gypi
@@ -178,7 +178,10 @@ 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")', }, 'dependencies': [ + 'remoting_base', + 'remoting_host', 'remoting_infoplist_strings', + '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp', ], 'defines': [ 'HOST_BUNDLE_NAME="<(host_bundle_name)"', @@ -190,21 +193,7 @@ '../third_party/jsoncpp/source/include/', '../third_party/jsoncpp/source/src/lib_json/', ], - - # These source files are included directly, instead of adding target - # dependencies, because the targets are not yet built for 64-bit on - # Mac OS X - http://crbug.com/125116. - # - # TODO(lambroslambrou): Fix this when Chrome supports building for - # Mac OS X 64-bit - http://crbug.com/128122. 'sources': [ - '../third_party/jsoncpp/overrides/src/lib_json/json_value.cpp', - '../third_party/jsoncpp/overrides/src/lib_json/json_reader.cpp', - '../third_party/jsoncpp/source/src/lib_json/json_writer.cpp', - '../third_party/modp_b64/modp_b64.cc', - 'host/constants_mac.cc', - 'host/constants_mac.h', - 'host/host_config_constants.cc', 'host/mac/me2me_preference_pane.h', 'host/mac/me2me_preference_pane.mm', 'host/mac/me2me_preference_pane_confirm_pin.h', @@ -221,7 +210,6 @@ ], }, 'xcode_settings': { - 'ARCHS': ['i386', 'x86_64'], 'GCC_ENABLE_OBJC_GC': 'supported', 'INFOPLIST_FILE': 'host/mac/me2me_preference_pane-Info.plist', 'INFOPLIST_PREPROCESS': 'YES',
diff --git a/sql/connection.cc b/sql/connection.cc index 4d23f7df..9daa7d1 100644 --- a/sql/connection.cc +++ b/sql/connection.cc
@@ -8,6 +8,7 @@ #include <stddef.h> #include <stdint.h> #include <string.h> +#include <utility> #include "base/bind.h" #include "base/debug/dump_without_crashing.h" @@ -695,9 +696,9 @@ scoped_ptr<base::ListValue> dumps(new base::ListValue); dumps->AppendString(histogram_tag_); - root_dict->Set(kDiagnosticDumpsKey, dumps.Pass()); + root_dict->Set(kDiagnosticDumpsKey, std::move(dumps)); - root = root_dict.Pass(); + root = std::move(root_dict); } else { // Failure to read a valid dictionary implies that something is going wrong // on the system. @@ -707,7 +708,7 @@ if (!read_root.get()) return false; scoped_ptr<base::DictionaryValue> root_dict = - base::DictionaryValue::From(read_root.Pass()); + base::DictionaryValue::From(std::move(read_root)); if (!root_dict) return false; @@ -731,7 +732,7 @@ // Record intention to proceed with upload. dumps->AppendString(histogram_tag_); - root = root_dict.Pass(); + root = std::move(root_dict); } const base::FilePath breadcrumb_new =
diff --git a/sql/mojo/mojo_vfs.cc b/sql/mojo/mojo_vfs.cc index 0fc2b48..5c427fb8 100644 --- a/sql/mojo/mojo_vfs.cc +++ b/sql/mojo/mojo_vfs.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/logging.h" #include "base/rand_util.h" @@ -116,7 +117,7 @@ filesystem::FileError error = filesystem::FILE_ERROR_FAILED; uint32_t num_bytes_written = 0; - GetFSFile(sql_file)->Write(mojo_data.Pass(), offset, + GetFSFile(sql_file)->Write(std::move(mojo_data), offset, filesystem::WHENCE_FROM_BEGIN, Capture(&error, &num_bytes_written)); GetFSFile(sql_file).WaitForIncomingResponse(); @@ -299,7 +300,7 @@ // |file| is actually a malloced buffer of size szOsFile. This means that we // need to manually use placement new to construct the C++ object which owns // the pipe to our file. - new (&GetFSFile(file)) filesystem::FilePtr(file_ptr.Pass()); + new (&GetFSFile(file)) filesystem::FilePtr(std::move(file_ptr)); return SQLITE_OK; } @@ -431,7 +432,7 @@ ScopedMojoFilesystemVFS::ScopedMojoFilesystemVFS( filesystem::DirectoryPtr root_directory) : parent_(sqlite3_vfs_find(NULL)), - root_directory_(root_directory.Pass()) { + root_directory_(std::move(root_directory)) { CHECK(!mojo_vfs.pAppData); mojo_vfs.pAppData = this; mojo_vfs.mxPathname = parent_->mxPathname;
diff --git a/sql/mojo/sql_test_base.cc b/sql/mojo/sql_test_base.cc index caa903a..1df60966 100644 --- a/sql/mojo/sql_test_base.cc +++ b/sql/mojo/sql_test_base.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "mojo/application/public/cpp/application_impl.h" #include "mojo/util/capture_util.h" @@ -79,7 +80,7 @@ test::CorruptSizeInHeaderMemory(&header.front(), db_size); uint32_t num_bytes_written = 0; - file_ptr->Write(header.Pass(), 0, filesystem::WHENCE_FROM_BEGIN, + file_ptr->Write(std::move(header), 0, filesystem::WHENCE_FROM_BEGIN, Capture(&error, &num_bytes_written)); file_ptr.WaitForIncomingResponse(); if (error != filesystem::FILE_ERROR_OK) @@ -112,7 +113,7 @@ memcpy(&data.front(), kJunk, strlen(kJunk)); uint32_t num_bytes_written = 0; - file_ptr->Write(data.Pass(), 0, filesystem::WHENCE_FROM_BEGIN, + file_ptr->Write(std::move(data), 0, filesystem::WHENCE_FROM_BEGIN, Capture(&error, &num_bytes_written)); file_ptr.WaitForIncomingResponse(); } @@ -143,12 +144,12 @@ filesystem::FileError error = filesystem::FILE_ERROR_FAILED; filesystem::DirectoryPtr directory; - files()->OpenFileSystem("temp", GetProxy(&directory), client.Pass(), + files()->OpenFileSystem("temp", GetProxy(&directory), std::move(client), Capture(&error)); ASSERT_TRUE(files().WaitForIncomingResponse()); ASSERT_EQ(filesystem::FILE_ERROR_OK, error); - vfs_.reset(new ScopedMojoFilesystemVFS(directory.Pass())); + vfs_.reset(new ScopedMojoFilesystemVFS(std::move(directory))); ASSERT_TRUE(db_.Open(db_path())); }
diff --git a/sql/mojo/vfs_unittest.cc b/sql/mojo/vfs_unittest.cc index d6eee65..dc6a1eec 100644 --- a/sql/mojo/vfs_unittest.cc +++ b/sql/mojo/vfs_unittest.cc
@@ -3,8 +3,8 @@ // found in the LICENSE file. #include <stdint.h> - #include <memory> +#include <utility> #include "base/macros.h" #include "components/filesystem/public/interfaces/file_system.mojom.h" @@ -60,12 +60,12 @@ filesystem::FileError error = filesystem::FILE_ERROR_FAILED; filesystem::DirectoryPtr directory; - files_->OpenFileSystem("temp", GetProxy(&directory), client.Pass(), + files_->OpenFileSystem("temp", GetProxy(&directory), std::move(client), mojo::Capture(&error)); ASSERT_TRUE(files_.WaitForIncomingResponse()); ASSERT_EQ(filesystem::FILE_ERROR_OK, error); - vfs_.reset(new ScopedMojoFilesystemVFS(directory.Pass())); + vfs_.reset(new ScopedMojoFilesystemVFS(std::move(directory))); } void TearDown() override {
diff --git a/sql/recovery.cc b/sql/recovery.cc index 7014433..377aafbf 100644 --- a/sql/recovery.cc +++ b/sql/recovery.cc
@@ -115,7 +115,7 @@ return scoped_ptr<Recovery>(); } - return r.Pass(); + return r; } // static
diff --git a/sql/recovery_unittest.cc b/sql/recovery_unittest.cc index 36c9de7..f964eb9c 100644 --- a/sql/recovery_unittest.cc +++ b/sql/recovery_unittest.cc
@@ -2,9 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <stddef.h> +#include "sql/recovery.h" +#include <stddef.h> #include <string> +#include <utility> #include "base/bind.h" #include "base/files/file_path.h" @@ -14,7 +16,6 @@ #include "base/strings/string_number_conversions.h" #include "sql/connection.h" #include "sql/meta_table.h" -#include "sql/recovery.h" #include "sql/statement.h" #include "sql/test/paths.h" #include "sql/test/scoped_error_ignorer.h" @@ -93,7 +94,7 @@ { scoped_ptr<sql::Recovery> recovery = sql::Recovery::Begin(&db(), db_path()); ASSERT_TRUE(recovery.get()); - sql::Recovery::Unrecoverable(recovery.Pass()); + sql::Recovery::Unrecoverable(std::move(recovery)); // TODO(shess): Test that calls to recover.db() start failing. } @@ -120,7 +121,7 @@ ASSERT_TRUE(recovery->db()->Execute(kAltInsertSql)); // Successfully recovered. - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } EXPECT_FALSE(db().is_open()); ASSERT_TRUE(Reopen()); @@ -163,7 +164,7 @@ ASSERT_TRUE(recovery->db()->Execute(kRecoveryCopySql)); // Successfully recovered. - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -204,7 +205,7 @@ ASSERT_TRUE(recovery->db()->Execute(kCreateIndex)); ASSERT_TRUE(recovery->db()->Execute(kRecoveryCopySql)); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Build a database, corrupt it by making an index reference to @@ -361,7 +362,7 @@ EXPECT_TRUE(recovery->GetMetaVersionNumber(&version)); EXPECT_EQ(kVersion, version); - sql::Recovery::Rollback(recovery.Pass()); + sql::Recovery::Rollback(std::move(recovery)); } ASSERT_TRUE(Reopen()); // Handle was poisoned. @@ -374,7 +375,7 @@ EXPECT_FALSE(recovery->GetMetaVersionNumber(&version)); EXPECT_EQ(0, version); - sql::Recovery::Rollback(recovery.Pass()); + sql::Recovery::Rollback(std::move(recovery)); } ASSERT_TRUE(Reopen()); // Handle was poisoned. @@ -424,7 +425,7 @@ EXPECT_EQ(temp_schema, ExecuteWithResults(recovery->db(), kTempSchemaSql, "|", "\n")); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -442,7 +443,7 @@ size_t rows = 0; EXPECT_FALSE(recovery->AutoRecoverTable("y", 0, &rows)); - sql::Recovery::Unrecoverable(recovery.Pass()); + sql::Recovery::Unrecoverable(std::move(recovery)); } } @@ -500,7 +501,7 @@ EXPECT_TRUE(recovery->AutoRecoverTable("x", 0, &rows)); EXPECT_EQ(4u, rows); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -536,7 +537,7 @@ EXPECT_TRUE(recovery->AutoRecoverTable("x", 0, &rows)); EXPECT_EQ(1u, rows); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // The schema should be the same, but only one row of data should @@ -575,7 +576,7 @@ EXPECT_TRUE(recovery->AutoRecoverTable("x", 0, &rows)); EXPECT_EQ(2u, rows); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -620,7 +621,7 @@ EXPECT_TRUE(recovery->AutoRecoverTable("x", 0, &rows)); EXPECT_EQ(3u, rows); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -654,7 +655,7 @@ size_t rows = 0; EXPECT_TRUE(recovery->AutoRecoverTable("x", 1, &rows)); EXPECT_EQ(2u, rows); - ASSERT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + ASSERT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } // Since the database was not corrupt, the entire schema and all @@ -689,7 +690,7 @@ EXPECT_EQ(43u, rows); // Successfully recovered. - EXPECT_TRUE(sql::Recovery::Recovered(recovery.Pass())); + EXPECT_TRUE(sql::Recovery::Recovered(std::move(recovery))); } } #endif // !defined(USE_SYSTEM_SQLITE)
diff --git a/storage/browser/blob/blob_data_builder.cc b/storage/browser/blob/blob_data_builder.cc index d40d418..b699910 100644 --- a/storage/browser/blob/blob_data_builder.cc +++ b/storage/browser/blob/blob_data_builder.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h" @@ -57,14 +58,14 @@ return; scoped_ptr<DataElement> element(new DataElement()); element->SetToBytes(data, length); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); } size_t BlobDataBuilder::AppendFutureData(size_t length) { CHECK_NE(length, 0u); scoped_ptr<DataElement> element(new DataElement()); element->SetToBytesDescription(length); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); return items_.size() - 1; } @@ -107,7 +108,7 @@ element->SetToFilePathRange(base::FilePath::FromUTF8Unsafe(std::string( kAppendFutureFileTemporaryFileName)), offset, length, base::Time()); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); return items_.size() - 1; } @@ -131,7 +132,7 @@ scoped_ptr<DataElement> element(new DataElement()); element->SetToFilePathRange(file_reference->path(), offset, length, expected_modification_time); - items_[index] = new BlobDataItem(element.Pass(), file_reference); + items_[index] = new BlobDataItem(std::move(element), file_reference); return true; } @@ -142,8 +143,8 @@ scoped_ptr<DataElement> element(new DataElement()); element->SetToFilePathRange(file_path, offset, length, expected_modification_time); - items_.push_back( - new BlobDataItem(element.Pass(), ShareableFileReference::Get(file_path))); + items_.push_back(new BlobDataItem(std::move(element), + ShareableFileReference::Get(file_path))); } void BlobDataBuilder::AppendBlob(const std::string& uuid, @@ -152,13 +153,13 @@ DCHECK_GT(length, 0ul); scoped_ptr<DataElement> element(new DataElement()); element->SetToBlobRange(uuid, offset, length); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); } void BlobDataBuilder::AppendBlob(const std::string& uuid) { scoped_ptr<DataElement> element(new DataElement()); element->SetToBlob(uuid); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); } void BlobDataBuilder::AppendFileSystemFile( @@ -170,7 +171,7 @@ scoped_ptr<DataElement> element(new DataElement()); element->SetToFileSystemUrlRange(url, offset, length, expected_modification_time); - items_.push_back(new BlobDataItem(element.Pass())); + items_.push_back(new BlobDataItem(std::move(element))); } void BlobDataBuilder::AppendDiskCacheEntry( @@ -180,9 +181,8 @@ scoped_ptr<DataElement> element(new DataElement()); element->SetToDiskCacheEntryRange( 0U, disk_cache_entry->GetDataSize(disk_cache_stream_index)); - items_.push_back( - new BlobDataItem(element.Pass(), data_handle, disk_cache_entry, - disk_cache_stream_index)); + items_.push_back(new BlobDataItem(std::move(element), data_handle, + disk_cache_entry, disk_cache_stream_index)); } void BlobDataBuilder::Clear() {
diff --git a/storage/browser/blob/blob_data_handle.cc b/storage/browser/blob/blob_data_handle.cc index efc757e5..efe13b1 100644 --- a/storage/browser/blob/blob_data_handle.cc +++ b/storage/browser/blob/blob_data_handle.cc
@@ -47,12 +47,8 @@ int64_t max_bytes_to_read, const base::Time& expected_modification_time) override { return file_system_context_->CreateFileStreamReader( - storage::FileSystemURL( - file_system_context_->CrackURL( - filesystem_url)), - offset, max_bytes_to_read, - expected_modification_time) - .Pass(); + storage::FileSystemURL(file_system_context_->CrackURL(filesystem_url)), + offset, max_bytes_to_read, expected_modification_time); } private: @@ -85,7 +81,7 @@ scoped_ptr<BlobDataSnapshot> BlobDataHandle::BlobDataHandleShared::CreateSnapshot() const { - return context_->CreateSnapshot(uuid_).Pass(); + return context_->CreateSnapshot(uuid_); } BlobDataHandle::BlobDataHandleShared::~BlobDataHandleShared() { @@ -121,7 +117,7 @@ scoped_ptr<BlobDataSnapshot> BlobDataHandle::CreateSnapshot() const { DCHECK(io_task_runner_->RunsTasksOnCurrentThread()); - return shared_->CreateSnapshot().Pass(); + return shared_->CreateSnapshot(); } const std::string& BlobDataHandle::uuid() const {
diff --git a/storage/browser/blob/blob_data_item.cc b/storage/browser/blob/blob_data_item.cc index 58ccabe..70495ed 100644 --- a/storage/browser/blob/blob_data_item.cc +++ b/storage/browser/blob/blob_data_item.cc
@@ -4,34 +4,33 @@ #include "storage/browser/blob/blob_data_item.h" +#include <utility> + namespace storage { BlobDataItem::DataHandle::~DataHandle() { } BlobDataItem::BlobDataItem(scoped_ptr<DataElement> item) - : item_(item.Pass()), + : item_(std::move(item)), disk_cache_entry_(nullptr), - disk_cache_stream_index_(-1) { -} + disk_cache_stream_index_(-1) {} BlobDataItem::BlobDataItem(scoped_ptr<DataElement> item, const scoped_refptr<DataHandle>& data_handle) - : item_(item.Pass()), + : item_(std::move(item)), data_handle_(data_handle), disk_cache_entry_(nullptr), - disk_cache_stream_index_(-1) { -} + disk_cache_stream_index_(-1) {} BlobDataItem::BlobDataItem(scoped_ptr<DataElement> item, const scoped_refptr<DataHandle>& data_handle, disk_cache::Entry* entry, int disk_cache_stream_index) - : item_(item.Pass()), + : item_(std::move(item)), data_handle_(data_handle), disk_cache_entry_(entry), - disk_cache_stream_index_(disk_cache_stream_index) { -} + disk_cache_stream_index_(disk_cache_stream_index) {} BlobDataItem::~BlobDataItem() {}
diff --git a/storage/browser/blob/blob_reader.cc b/storage/browser/blob/blob_reader.cc index 8a38bfe..6e3e866 100644 --- a/storage/browser/blob/blob_reader.cc +++ b/storage/browser/blob/blob_reader.cc
@@ -6,9 +6,9 @@ #include <stddef.h> #include <stdint.h> - #include <algorithm> #include <limits> +#include <utility> #include "base/bind.h" #include "base/sequenced_task_runner.h" @@ -44,12 +44,12 @@ const BlobDataHandle* blob_handle, scoped_ptr<FileStreamReaderProvider> file_stream_provider, base::SequencedTaskRunner* file_task_runner) - : file_stream_provider_(file_stream_provider.Pass()), + : file_stream_provider_(std::move(file_stream_provider)), file_task_runner_(file_task_runner), net_error_(net::OK), weak_factory_(this) { if (blob_handle) { - blob_data_ = blob_handle->CreateSnapshot().Pass(); + blob_data_ = blob_handle->CreateSnapshot(); } } @@ -527,19 +527,15 @@ switch (item.type()) { case DataElement::TYPE_FILE: return file_stream_provider_->CreateForLocalFile( - file_task_runner_.get(), item.path(), - item.offset() + additional_offset, - item.expected_modification_time()) - .Pass(); + file_task_runner_.get(), item.path(), + item.offset() + additional_offset, item.expected_modification_time()); case DataElement::TYPE_FILE_FILESYSTEM: - return file_stream_provider_ - ->CreateFileStreamReader( - item.filesystem_url(), item.offset() + additional_offset, - item.length() == std::numeric_limits<uint64_t>::max() - ? storage::kMaximumLength - : item.length() - additional_offset, - item.expected_modification_time()) - .Pass(); + return file_stream_provider_->CreateFileStreamReader( + item.filesystem_url(), item.offset() + additional_offset, + item.length() == std::numeric_limits<uint64_t>::max() + ? storage::kMaximumLength + : item.length() - additional_offset, + item.expected_modification_time()); case DataElement::TYPE_BLOB: case DataElement::TYPE_BYTES: case DataElement::TYPE_BYTES_DESCRIPTION:
diff --git a/storage/browser/blob/blob_storage_context.cc b/storage/browser/blob/blob_storage_context.cc index e9e9601..e8fc008 100644 --- a/storage/browser/blob/blob_storage_context.cc +++ b/storage/browser/blob/blob_storage_context.cc
@@ -6,9 +6,9 @@ #include <stddef.h> #include <stdint.h> - #include <algorithm> #include <limits> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -75,15 +75,15 @@ scoped_ptr<BlobDataHandle> result; BlobMap::iterator found = blob_map_.find(uuid); if (found == blob_map_.end()) - return result.Pass(); + return result; auto* entry = found->second; if (entry->flags & EXCEEDED_MEMORY) - return result.Pass(); + return result; DCHECK(!entry->IsBeingBuilt()); result.reset(new BlobDataHandle(uuid, entry->data->content_type(), entry->data->content_disposition(), this, base::ThreadTaskRunnerHandle::Get().get())); - return result.Pass(); + return result; } scoped_ptr<BlobDataHandle> BlobStorageContext::GetBlobDataFromPublicURL( @@ -119,7 +119,7 @@ scoped_ptr<BlobDataHandle> handle = GetBlobDataFromUUID(external_builder.uuid_); DecrementBlobRefCount(external_builder.uuid_); - return handle.Pass(); + return handle; } scoped_ptr<BlobDataHandle> BlobStorageContext::AddFinishedBlob( @@ -273,25 +273,25 @@ case DataElement::TYPE_BYTES: DCHECK(!ipc_data.offset()); element->SetToBytes(ipc_data.bytes(), length); - blob_item = new BlobDataItem(element.Pass()); + blob_item = new BlobDataItem(std::move(element)); break; case DataElement::TYPE_FILE: element->SetToFilePathRange(ipc_data.path(), ipc_data.offset(), length, ipc_data.expected_modification_time()); blob_item = new BlobDataItem( - element.Pass(), ShareableFileReference::Get(ipc_data.path())); + std::move(element), ShareableFileReference::Get(ipc_data.path())); break; case DataElement::TYPE_FILE_FILESYSTEM: element->SetToFileSystemUrlRange(ipc_data.filesystem_url(), ipc_data.offset(), length, ipc_data.expected_modification_time()); - blob_item = new BlobDataItem(element.Pass()); + blob_item = new BlobDataItem(std::move(element)); break; case DataElement::TYPE_BLOB: // This is a temporary item that will be deconstructed later. element->SetToBlobRange(ipc_data.blob_uuid(), ipc_data.offset(), ipc_data.length()); - blob_item = new BlobDataItem(element.Pass()); + blob_item = new BlobDataItem(std::move(element)); break; case DataElement::TYPE_DISK_CACHE_ENTRY: // This type can't be sent by IPC. NOTREACHED(); @@ -447,7 +447,7 @@ static_cast<int64_t>(new_length)); memory_usage_ += new_length; target_blob_builder->AppendSharedBlobItem(new ShareableBlobDataItem( - target_blob_uuid, new BlobDataItem(element.Pass()))); + target_blob_uuid, new BlobDataItem(std::move(element)))); } break; case DataElement::TYPE_FILE: { DCHECK_NE(item.length(), std::numeric_limits<uint64_t>::max()) @@ -460,7 +460,7 @@ item.expected_modification_time()); target_blob_builder->AppendSharedBlobItem(new ShareableBlobDataItem( target_blob_uuid, - new BlobDataItem(element.Pass(), item.data_handle_))); + new BlobDataItem(std::move(element), item.data_handle_))); } break; case DataElement::TYPE_FILE_FILESYSTEM: { UMA_HISTOGRAM_COUNTS("Storage.BlobItemSize.BlobSlice.FileSystem", @@ -470,7 +470,7 @@ item.offset() + offset, new_length, item.expected_modification_time()); target_blob_builder->AppendSharedBlobItem(new ShareableBlobDataItem( - target_blob_uuid, new BlobDataItem(element.Pass()))); + target_blob_uuid, new BlobDataItem(std::move(element)))); } break; case DataElement::TYPE_DISK_CACHE_ENTRY: { scoped_ptr<DataElement> element(new DataElement()); @@ -478,7 +478,7 @@ new_length); target_blob_builder->AppendSharedBlobItem(new ShareableBlobDataItem( target_blob_uuid, - new BlobDataItem(element.Pass(), item.data_handle_, + new BlobDataItem(std::move(element), item.data_handle_, item.disk_cache_entry(), item.disk_cache_stream_index()))); } break;
diff --git a/storage/browser/blob/blob_url_request_job_factory.cc b/storage/browser/blob/blob_url_request_job_factory.cc index 7e814d4..ed9c137 100644 --- a/storage/browser/blob/blob_url_request_job_factory.cc +++ b/storage/browser/blob/blob_url_request_job_factory.cc
@@ -4,6 +4,8 @@ #include "storage/browser/blob/blob_url_request_job_factory.h" +#include <utility> + #include "base/strings/string_util.h" #include "net/base/request_priority.h" #include "net/url_request/url_request_context.h" @@ -28,8 +30,8 @@ const GURL kBlobUrl("blob://see_user_data/"); scoped_ptr<net::URLRequest> request = request_context->CreateRequest( kBlobUrl, net::DEFAULT_PRIORITY, request_delegate); - SetRequestedBlobDataHandle(request.get(), blob_data_handle.Pass()); - return request.Pass(); + SetRequestedBlobDataHandle(request.get(), std::move(blob_data_handle)); + return request; } // static @@ -84,7 +86,7 @@ scoped_ptr<BlobDataHandle> handle = context_->GetBlobDataFromUUID(uuid); BlobDataHandle* handle_ptr = handle.get(); if (handle) { - SetRequestedBlobDataHandle(request, handle.Pass()); + SetRequestedBlobDataHandle(request, std::move(handle)); } return handle_ptr; }
diff --git a/storage/browser/blob/internal_blob_data.cc b/storage/browser/blob/internal_blob_data.cc index fae109a..cbec290 100644 --- a/storage/browser/blob/internal_blob_data.cc +++ b/storage/browser/blob/internal_blob_data.cc
@@ -5,6 +5,7 @@ #include "storage/browser/blob/internal_blob_data.h" #include <stddef.h> +#include <utility> #include "base/containers/hash_tables.h" #include "base/metrics/histogram.h" @@ -50,7 +51,7 @@ scoped_ptr<InternalBlobData> InternalBlobData::Builder::Build() { DCHECK(data_); - return data_.Pass(); + return std::move(data_); } InternalBlobData::InternalBlobData() {
diff --git a/storage/browser/blob/shareable_file_reference.cc b/storage/browser/blob/shareable_file_reference.cc index 187ea70..c8672f7 100644 --- a/storage/browser/blob/shareable_file_reference.cc +++ b/storage/browser/blob/shareable_file_reference.cc
@@ -5,6 +5,7 @@ #include "storage/browser/blob/shareable_file_reference.h" #include <map> +#include <utility> #include "base/lazy_instance.h" #include "base/macros.h" @@ -97,7 +98,7 @@ // Wasn't in the map, create a new reference and store the pointer. scoped_refptr<ShareableFileReference> reference( - new ShareableFileReference(scoped_file.Pass())); + new ShareableFileReference(std::move(scoped_file))); result.first->second = reference.get(); return reference; } @@ -109,7 +110,7 @@ } ShareableFileReference::ShareableFileReference(ScopedFile scoped_file) - : scoped_file_(scoped_file.Pass()) { + : scoped_file_(std::move(scoped_file)) { DCHECK(g_file_map.Get().Find(path())->second == NULL); }
diff --git a/storage/browser/blob/upload_blob_element_reader.cc b/storage/browser/blob/upload_blob_element_reader.cc index d44f840..3c86051 100644 --- a/storage/browser/blob/upload_blob_element_reader.cc +++ b/storage/browser/blob/upload_blob_element_reader.cc
@@ -5,6 +5,7 @@ #include "storage/browser/blob/upload_blob_element_reader.h" #include <stdint.h> +#include <utility> #include "base/single_thread_task_runner.h" #include "net/base/net_errors.h" @@ -18,7 +19,7 @@ scoped_ptr<BlobDataHandle> handle, FileSystemContext* file_system_context, base::SingleThreadTaskRunner* file_task_runner) - : handle_(handle.Pass()), + : handle_(std::move(handle)), file_system_context_(file_system_context), file_runner_(file_task_runner) {}
diff --git a/storage/browser/database/database_tracker.cc b/storage/browser/database/database_tracker.cc index 6a10107..42041c7 100644 --- a/storage/browser/database/database_tracker.cc +++ b/storage/browser/database/database_tracker.cc
@@ -5,8 +5,8 @@ #include "storage/browser/database/database_tracker.h" #include <stdint.h> - #include <algorithm> +#include <utility> #include <vector> #include "base/bind.h" @@ -761,7 +761,7 @@ if (!file.IsValid()) return NULL; - base::File* to_insert = new base::File(file.Pass()); + base::File* to_insert = new base::File(std::move(file)); std::pair<FileHandlesMap::iterator, bool> rv = incognito_file_handles_.insert(std::make_pair(vfs_file_name, to_insert)); DCHECK(rv.second);
diff --git a/storage/browser/fileapi/async_file_util_adapter.cc b/storage/browser/fileapi/async_file_util_adapter.cc index 6f7cafd..361c73a 100644 --- a/storage/browser/fileapi/async_file_util_adapter.cc +++ b/storage/browser/fileapi/async_file_util_adapter.cc
@@ -6,7 +6,7 @@ #include <stddef.h> #include <stdint.h> - +#include <utility> #include <vector> #include "base/bind.h" @@ -76,7 +76,7 @@ void ReplySnapshotFile( const AsyncFileUtil::CreateSnapshotFileCallback& callback) { callback.Run(error_, file_info_, platform_path_, - ShareableFileReference::GetOrCreate(scoped_file_.Pass())); + ShareableFileReference::GetOrCreate(std::move(scoped_file_))); } private: @@ -138,7 +138,7 @@ FileSystemOperationContext* context, const AsyncFileUtil::CreateOrOpenCallback& callback, base::File file) { - callback.Run(file.Pass(), base::Closure()); + callback.Run(std::move(file), base::Closure()); } } // namespace
diff --git a/storage/browser/fileapi/copy_or_move_operation_delegate.cc b/storage/browser/fileapi/copy_or_move_operation_delegate.cc index f3072a1..1577278 100644 --- a/storage/browser/fileapi/copy_or_move_operation_delegate.cc +++ b/storage/browser/fileapi/copy_or_move_operation_delegate.cc
@@ -5,6 +5,7 @@ #include "storage/browser/fileapi/copy_or_move_operation_delegate.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/files/file_path.h" @@ -382,8 +383,8 @@ src_url_(src_url), dest_url_(dest_url), option_(option), - reader_(reader.Pass()), - writer_(writer.Pass()), + reader_(std::move(reader)), + writer_(std::move(writer)), file_progress_callback_(file_progress_callback), cancel_requested_(false), weak_factory_(this) {} @@ -502,8 +503,9 @@ NotifyOnStartUpdate(dest_url_); DCHECK(!copy_helper_); copy_helper_.reset(new CopyOrMoveOperationDelegate::StreamCopyHelper( - reader_.Pass(), writer_.Pass(), dest_url_.mount_option().flush_policy(), - kReadBufferSize, file_progress_callback_, + std::move(reader_), std::move(writer_), + dest_url_.mount_option().flush_policy(), kReadBufferSize, + file_progress_callback_, base::TimeDelta::FromMilliseconds( kMinProgressCallbackInvocationSpanInMilliseconds))); copy_helper_->Run( @@ -593,8 +595,8 @@ int buffer_size, const FileSystemOperation::CopyFileProgressCallback& file_progress_callback, const base::TimeDelta& min_progress_callback_invocation_span) - : reader_(reader.Pass()), - writer_(writer.Pass()), + : reader_(std::move(reader)), + writer_(std::move(writer)), flush_policy_(flush_policy), file_progress_callback_(file_progress_callback), io_buffer_(new net::IOBufferWithSize(buffer_size)), @@ -603,8 +605,7 @@ min_progress_callback_invocation_span_( min_progress_callback_invocation_span), cancel_requested_(false), - weak_factory_(this) { -} + weak_factory_(this) {} CopyOrMoveOperationDelegate::StreamCopyHelper::~StreamCopyHelper() { } @@ -824,17 +825,10 @@ file_system_context()->CreateFileStreamWriter(dest_url, 0); if (reader && writer) { impl = new StreamCopyOrMoveImpl( - operation_runner(), - file_system_context(), - operation_type_, - src_url, - dest_url, - option_, - reader.Pass(), - writer.Pass(), + operation_runner(), file_system_context(), operation_type_, src_url, + dest_url, option_, std::move(reader), std::move(writer), base::Bind(&CopyOrMoveOperationDelegate::OnCopyFileProgress, - weak_factory_.GetWeakPtr(), - src_url)); + weak_factory_.GetWeakPtr(), src_url)); } }
diff --git a/storage/browser/fileapi/file_system_context.cc b/storage/browser/fileapi/file_system_context.cc index 5ded6c3..6d84f1e 100644 --- a/storage/browser/fileapi/file_system_context.cc +++ b/storage/browser/fileapi/file_system_context.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -159,7 +160,7 @@ partition_path, special_storage_policy, options)), - additional_backends_(additional_backends.Pass()), + additional_backends_(std::move(additional_backends)), auto_mount_handlers_(auto_mount_handlers), external_mount_points_(external_mount_points), partition_path_(partition_path),
diff --git a/storage/browser/fileapi/file_system_operation_impl.cc b/storage/browser/fileapi/file_system_operation_impl.cc index 84d80f6..15700f0 100644 --- a/storage/browser/fileapi/file_system_operation_impl.cc +++ b/storage/browser/fileapi/file_system_operation_impl.cc
@@ -5,8 +5,8 @@ #include "storage/browser/fileapi/file_system_operation_impl.h" #include <stdint.h> - #include <limits> +#include <utility> #include "base/bind.h" #include "base/single_thread_task_runner.h" @@ -49,7 +49,7 @@ base::Bind(&Destruct, base::Passed(&file))); return; } - callback.Run(file.Pass(), on_close_callback); + callback.Run(std::move(file), on_close_callback); } } // namespace @@ -59,7 +59,7 @@ FileSystemContext* file_system_context, scoped_ptr<FileSystemOperationContext> operation_context) { return new FileSystemOperationImpl(url, file_system_context, - operation_context.Pass()); + std::move(operation_context)); } FileSystemOperationImpl::~FileSystemOperationImpl() { @@ -135,7 +135,7 @@ const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationDirectoryExists)); async_file_util_->GetFileInfo( - operation_context_.Pass(), url, GET_METADATA_FIELD_IS_DIRECTORY, + std::move(operation_context_), url, GET_METADATA_FIELD_IS_DIRECTORY, base::Bind(&FileSystemOperationImpl::DidDirectoryExists, weak_factory_.GetWeakPtr(), callback)); } @@ -144,7 +144,7 @@ const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationFileExists)); async_file_util_->GetFileInfo( - operation_context_.Pass(), url, GET_METADATA_FIELD_IS_DIRECTORY, + std::move(operation_context_), url, GET_METADATA_FIELD_IS_DIRECTORY, base::Bind(&FileSystemOperationImpl::DidFileExists, weak_factory_.GetWeakPtr(), callback)); } @@ -153,15 +153,14 @@ int fields, const GetMetadataCallback& callback) { DCHECK(SetPendingOperationType(kOperationGetMetadata)); - async_file_util_->GetFileInfo(operation_context_.Pass(), url, fields, + async_file_util_->GetFileInfo(std::move(operation_context_), url, fields, callback); } void FileSystemOperationImpl::ReadDirectory( const FileSystemURL& url, const ReadDirectoryCallback& callback) { DCHECK(SetPendingOperationType(kOperationReadDirectory)); - async_file_util_->ReadDirectory( - operation_context_.Pass(), url, callback); + async_file_util_->ReadDirectory(std::move(operation_context_), url, callback); } void FileSystemOperationImpl::Remove(const FileSystemURL& url, @@ -175,7 +174,7 @@ // first. If not supported, it is delegated to RemoveOperationDelegate // in DidDeleteRecursively. async_file_util_->DeleteRecursively( - operation_context_.Pass(), url, + std::move(operation_context_), url, base::Bind(&FileSystemOperationImpl::DidDeleteRecursively, weak_factory_.GetWeakPtr(), url, callback)); return; @@ -195,11 +194,11 @@ scoped_ptr<net::URLRequest> blob_request, const WriteCallback& callback) { DCHECK(SetPendingOperationType(kOperationWrite)); - file_writer_delegate_ = writer_delegate.Pass(); + file_writer_delegate_ = std::move(writer_delegate); file_writer_delegate_->Start( - blob_request.Pass(), - base::Bind(&FileSystemOperationImpl::DidWrite, - weak_factory_.GetWeakPtr(), url, callback)); + std::move(blob_request), + base::Bind(&FileSystemOperationImpl::DidWrite, weak_factory_.GetWeakPtr(), + url, callback)); } void FileSystemOperationImpl::Truncate(const FileSystemURL& url, @@ -227,8 +226,7 @@ TRACE_EVENT0("io", "FileSystemOperationImpl::TouchFile"); async_file_util_->Touch( - operation_context_.Pass(), url, - last_access_time, last_modified_time, + std::move(operation_context_), url, last_access_time, last_modified_time, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -281,8 +279,8 @@ const FileSystemURL& url, const SnapshotFileCallback& callback) { DCHECK(SetPendingOperationType(kOperationCreateSnapshotFile)); - async_file_util_->CreateSnapshotFile( - operation_context_.Pass(), url, callback); + async_file_util_->CreateSnapshotFile(std::move(operation_context_), url, + callback); } void FileSystemOperationImpl::CopyInForeignFile( @@ -307,7 +305,7 @@ const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationRemove)); async_file_util_->DeleteFile( - operation_context_.Pass(), url, + std::move(operation_context_), url, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -317,7 +315,7 @@ const StatusCallback& callback) { DCHECK(SetPendingOperationType(kOperationRemove)); async_file_util_->DeleteDirectory( - operation_context_.Pass(), url, + std::move(operation_context_), url, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -378,7 +376,7 @@ FileSystemContext* file_system_context, scoped_ptr<FileSystemOperationContext> operation_context) : file_system_context_(file_system_context), - operation_context_(operation_context.Pass()), + operation_context_(std::move(operation_context)), async_file_util_(NULL), pending_operation_(kOperationNone), weak_factory_(this) { @@ -434,11 +432,10 @@ const StatusCallback& callback, bool exclusive) { async_file_util_->EnsureFileExists( - operation_context_.Pass(), url, + std::move(operation_context_), url, base::Bind( - exclusive ? - &FileSystemOperationImpl::DidEnsureFileExistsExclusive : - &FileSystemOperationImpl::DidEnsureFileExistsNonExclusive, + exclusive ? &FileSystemOperationImpl::DidEnsureFileExistsExclusive + : &FileSystemOperationImpl::DidEnsureFileExistsNonExclusive, weak_factory_.GetWeakPtr(), callback)); } @@ -447,8 +444,7 @@ const StatusCallback& callback, bool exclusive, bool recursive) { async_file_util_->CreateDirectory( - operation_context_.Pass(), - url, exclusive, recursive, + std::move(operation_context_), url, exclusive, recursive, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -460,7 +456,8 @@ const CopyFileProgressCallback& progress_callback, const StatusCallback& callback) { async_file_util_->CopyFileLocal( - operation_context_.Pass(), src_url, dest_url, option, progress_callback, + std::move(operation_context_), src_url, dest_url, option, + progress_callback, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -471,7 +468,7 @@ CopyOrMoveOption option, const StatusCallback& callback) { async_file_util_->MoveFileLocal( - operation_context_.Pass(), src_url, dest_url, option, + std::move(operation_context_), src_url, dest_url, option, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -481,8 +478,7 @@ const FileSystemURL& dest_url, const StatusCallback& callback) { async_file_util_->CopyInForeignFile( - operation_context_.Pass(), - src_local_disk_file_path, dest_url, + std::move(operation_context_), src_local_disk_file_path, dest_url, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -491,7 +487,7 @@ const StatusCallback& callback, int64_t length) { async_file_util_->Truncate( - operation_context_.Pass(), url, length, + std::move(operation_context_), url, length, base::Bind(&FileSystemOperationImpl::DidFinishOperation, weak_factory_.GetWeakPtr(), callback)); } @@ -500,9 +496,9 @@ const OpenFileCallback& callback, int file_flags) { async_file_util_->CreateOrOpen( - operation_context_.Pass(), url, file_flags, - base::Bind(&DidOpenFile, - file_system_context_, weak_factory_.GetWeakPtr(), callback)); + std::move(operation_context_), url, file_flags, + base::Bind(&DidOpenFile, file_system_context_, weak_factory_.GetWeakPtr(), + callback)); } void FileSystemOperationImpl::DidEnsureFileExistsExclusive(
diff --git a/storage/browser/fileapi/file_system_operation_runner.cc b/storage/browser/fileapi/file_system_operation_runner.cc index 0ca729b..20a957b 100644 --- a/storage/browser/fileapi/file_system_operation_runner.cc +++ b/storage/browser/fileapi/file_system_operation_runner.cc
@@ -5,6 +5,7 @@ #include "storage/browser/fileapi/file_system_operation_runner.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/macros.h" @@ -262,18 +263,17 @@ return handle.id; } - scoped_ptr<FileWriterDelegate> writer_delegate( - new FileWriterDelegate(writer.Pass(), url.mount_option().flush_policy())); + scoped_ptr<FileWriterDelegate> writer_delegate(new FileWriterDelegate( + std::move(writer), url.mount_option().flush_policy())); scoped_ptr<net::URLRequest> blob_request( storage::BlobProtocolHandler::CreateBlobRequest( - blob.Pass(), url_request_context, writer_delegate.get())); + std::move(blob), url_request_context, writer_delegate.get())); PrepareForWrite(handle.id, url); - operation->Write( - url, writer_delegate.Pass(), blob_request.Pass(), - base::Bind(&FileSystemOperationRunner::DidWrite, AsWeakPtr(), - handle, callback)); + operation->Write(url, std::move(writer_delegate), std::move(blob_request), + base::Bind(&FileSystemOperationRunner::DidWrite, AsWeakPtr(), + handle, callback)); return handle.id; } @@ -591,7 +591,7 @@ on_close_callback)); return; } - callback.Run(file.Pass(), on_close_callback); + callback.Run(std::move(file), on_close_callback); FinishOperation(handle.id); }
diff --git a/storage/browser/fileapi/file_writer_delegate.cc b/storage/browser/fileapi/file_writer_delegate.cc index 8ccf84617..2b1354e 100644 --- a/storage/browser/fileapi/file_writer_delegate.cc +++ b/storage/browser/fileapi/file_writer_delegate.cc
@@ -5,6 +5,7 @@ #include "storage/browser/fileapi/file_writer_delegate.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/callback.h" @@ -25,15 +26,14 @@ FileWriterDelegate::FileWriterDelegate( scoped_ptr<FileStreamWriter> file_stream_writer, FlushPolicy flush_policy) - : file_stream_writer_(file_stream_writer.Pass()), + : file_stream_writer_(std::move(file_stream_writer)), writing_started_(false), flush_policy_(flush_policy), bytes_written_backlog_(0), bytes_written_(0), bytes_read_(0), io_buffer_(new net::IOBufferWithSize(kReadBufSize)), - weak_factory_(this) { -} + weak_factory_(this) {} FileWriterDelegate::~FileWriterDelegate() { } @@ -41,7 +41,7 @@ void FileWriterDelegate::Start(scoped_ptr<net::URLRequest> request, const DelegateWriteCallback& write_callback) { write_callback_ = write_callback; - request_ = request.Pass(); + request_ = std::move(request); request_->Start(); }
diff --git a/storage/browser/fileapi/obfuscated_file_util.cc b/storage/browser/fileapi/obfuscated_file_util.cc index cbe2739..cdd8b7a 100644 --- a/storage/browser/fileapi/obfuscated_file_util.cc +++ b/storage/browser/fileapi/obfuscated_file_util.cc
@@ -281,7 +281,7 @@ sandbox_delegate_) { sandbox_delegate_->StickyInvalidateUsageCache(url.origin(), url.type()); } - return file.Pass(); + return file; } base::File::Error ObfuscatedFileUtil::EnsureFileExists( @@ -1064,7 +1064,7 @@ base::File file = NativeFileUtil::CreateOrOpen(dest_local_path, file_flags); if (!file.IsValid()) - return file.Pass(); + return file; if (!file.created()) { file.Close(); @@ -1079,7 +1079,7 @@ return base::File(error); } - return file.Pass(); + return file; } base::File::Error ObfuscatedFileUtil::CreateFile( @@ -1374,7 +1374,7 @@ context->change_observers()->Notify( &FileChangeObserver::OnCreateFile, base::MakeTuple(url)); } - return file.Pass(); + return file; } if (file_flags & base::File::FLAG_CREATE) @@ -1408,7 +1408,7 @@ LOG(WARNING) << "Lost a backing file."; return base::File(base::File::FILE_ERROR_FAILED); } - return file.Pass(); + return file; } // If truncating we need to update the usage. @@ -1417,7 +1417,7 @@ context->change_observers()->Notify( &FileChangeObserver::OnModifyFile, base::MakeTuple(url)); } - return file.Pass(); + return file; } bool ObfuscatedFileUtil::HasIsolatedStorage(const GURL& origin) {
diff --git a/storage/browser/fileapi/plugin_private_file_system_backend.cc b/storage/browser/fileapi/plugin_private_file_system_backend.cc index f1a1beb..2eb36ff 100644 --- a/storage/browser/fileapi/plugin_private_file_system_backend.cc +++ b/storage/browser/fileapi/plugin_private_file_system_backend.cc
@@ -5,8 +5,8 @@ #include "storage/browser/fileapi/plugin_private_file_system_backend.h" #include <stdint.h> - #include <map> +#include <utility> #include "base/stl_util.h" #include "base/synchronization/lock.h" @@ -182,7 +182,8 @@ base::File::Error* error_code) const { scoped_ptr<FileSystemOperationContext> operation_context( new FileSystemOperationContext(context)); - return FileSystemOperation::Create(url, context, operation_context.Pass()); + return FileSystemOperation::Create(url, context, + std::move(operation_context)); } bool PluginPrivateFileSystemBackend::SupportsStreaming(
diff --git a/storage/browser/fileapi/quota/quota_reservation_manager.cc b/storage/browser/fileapi/quota/quota_reservation_manager.cc index 6b69191..b6d2387 100644 --- a/storage/browser/fileapi/quota/quota_reservation_manager.cc +++ b/storage/browser/fileapi/quota/quota_reservation_manager.cc
@@ -5,6 +5,7 @@ #include "storage/browser/fileapi/quota/quota_reservation_manager.h" #include <stdint.h> +#include <utility> #include "storage/browser/fileapi/quota/quota_reservation.h" #include "storage/browser/fileapi/quota/quota_reservation_buffer.h" @@ -13,8 +14,7 @@ QuotaReservationManager::QuotaReservationManager( scoped_ptr<QuotaBackend> backend) - : backend_(backend.Pass()), - weak_ptr_factory_(this) { + : backend_(std::move(backend)), weak_ptr_factory_(this) { sequence_checker_.DetachFromSequence(); }
diff --git a/storage/browser/fileapi/sandbox_file_system_backend.cc b/storage/browser/fileapi/sandbox_file_system_backend.cc index c8b7f37..2b64193 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend.cc +++ b/storage/browser/fileapi/sandbox_file_system_backend.cc
@@ -5,6 +5,7 @@ #include "storage/browser/fileapi/sandbox_file_system_backend.h" #include <stdint.h> +#include <utility> #include "base/bind.h" #include "base/files/file_util.h" @@ -119,7 +120,8 @@ else operation_context->set_quota_limit_type(storage::kQuotaLimitTypeLimited); - return FileSystemOperation::Create(url, context, operation_context.Pass()); + return FileSystemOperation::Create(url, context, + std::move(operation_context)); } bool SandboxFileSystemBackend::SupportsStreaming(
diff --git a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc index a7f1d836..5e3138f 100644 --- a/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc +++ b/storage/browser/fileapi/sandbox_file_system_backend_delegate.cc
@@ -294,7 +294,7 @@ operation_context->set_change_observers( change_observers ? *change_observers : ChangeObserverList()); - return operation_context.Pass(); + return operation_context; } scoped_ptr<storage::FileStreamReader>
diff --git a/storage/browser/fileapi/timed_task_helper.cc b/storage/browser/fileapi/timed_task_helper.cc index f16f8b8..69635d0 100644 --- a/storage/browser/fileapi/timed_task_helper.cc +++ b/storage/browser/fileapi/timed_task_helper.cc
@@ -4,6 +4,8 @@ #include "storage/browser/fileapi/timed_task_helper.h" +#include <utility> + #include "base/bind.h" #include "base/logging.h" #include "base/sequenced_task_runner.h" @@ -64,14 +66,14 @@ if (!tracker->timer) return; TimedTaskHelper* timer = tracker->timer; - timer->OnFired(tracker.Pass()); + timer->OnFired(std::move(tracker)); } void TimedTaskHelper::OnFired(scoped_ptr<Tracker> tracker) { DCHECK(task_runner_->RunsTasksOnCurrentThread()); base::TimeTicks now = base::TimeTicks::Now(); if (desired_run_time_ > now) { - PostDelayedTask(tracker.Pass(), desired_run_time_ - now); + PostDelayedTask(std::move(tracker), desired_run_time_ - now); return; } tracker.reset();
diff --git a/storage/browser/fileapi/transient_file_util.cc b/storage/browser/fileapi/transient_file_util.cc index c0c2a6b..426b73d 100644 --- a/storage/browser/fileapi/transient_file_util.cc +++ b/storage/browser/fileapi/transient_file_util.cc
@@ -49,7 +49,7 @@ scoped_file.AddScopeOutCallback( base::Bind(&RevokeFileSystem, url.filesystem_id()), NULL); - return scoped_file.Pass(); + return scoped_file; } } // namespace storage
diff --git a/storage/browser/quota/quota_manager.cc b/storage/browser/quota/quota_manager.cc index aa8a9f6b..7f6cec3 100644 --- a/storage/browser/quota/quota_manager.cc +++ b/storage/browser/quota/quota_manager.cc
@@ -6,10 +6,10 @@ #include <stddef.h> #include <stdint.h> - #include <algorithm> #include <functional> #include <limits> +#include <utility> #include "base/bind.h" #include "base/bind_helpers.h" @@ -1004,7 +1004,7 @@ void QuotaManager::SetTemporaryStorageEvictionPolicy( scoped_ptr<QuotaEvictionPolicy> policy) { - temporary_storage_eviction_policy_ = policy.Pass(); + temporary_storage_eviction_policy_ = std::move(policy); } void QuotaManager::DeleteOriginData(const GURL& origin,
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations index 1668bc11..f7ea10b 100644 --- a/third_party/WebKit/LayoutTests/TestExpectations +++ b/third_party/WebKit/LayoutTests/TestExpectations
@@ -219,9 +219,6 @@ crbug.com/461179 virtual/spv2/paint/invalidation/invalidate-when-receiving-paint-layer.html [ Failure ] -crbug.com/327832 tables/mozilla/bugs/bug3037-1.html [ NeedsRebaseline ] -crbug.com/327832 fast/dynamic/insert-before-table-part-in-continuation.html [ NeedsRebaseline ] - crbug.com/542541 [ Debug ] fast/events/click-count.html [ Pass Failure ] crbug.com/542541 [ Debug ] virtual/trustedeventsdefaultaction/fast/events/click-count.html [ Pass Failure ] crbug.com/542541 [ Debug ] virtual/pointerevent/fast/events/click-count.html [ Pass Failure ] @@ -260,7 +257,9 @@ crbug.com/498539 [ Mac10.7 ] inspector/sources/debugger/js-with-inline-stylesheets.html [ Pass Timeout ] crbug.com/498539 [ Mac10.7 Mac10.8 Retina Mac10.9 Mac10.10 Mac10.6 ] inspector/sources/debugger/live-edit-no-reveal.html [ Crash Pass Timeout ] crbug.com/498539 [ Mac10.8 Mac10.10 ] inspector/sources/debugger/debug-inlined-scripts-fragment-id.html [ Pass Timeout ] -crbug.com/498539 [ Precise ] inspector/sources/debugger-step/debugger-step-over-inlined-scripts.html [ Pass Timeout ] +# TODO(yangguo): Below is commented out as it conflicts with another [ NeedsManualRebaseline ] entry. +# See also http://crbug.com/569175. +# crbug.com/498539 [ Precise ] inspector/sources/debugger-step/debugger-step-over-inlined-scripts.html [ Pass Timeout ] crbug.com/498539 [ Precise Win7 Mac10.10 ] inspector/sources/debugger-breakpoints/dynamic-scripts-breakpoints.html [ Pass Timeout ] crbug.com/498539 [ Precise Mac10.10 ] inspector/sources/debugger-breakpoints/set-breakpoint.html [ Pass Timeout ] crbug.com/498539 [ Trusty ] inspector/sources/debugger/mutation-observer-suspend-while-paused.html [ Pass Timeout ] @@ -796,13 +795,6 @@ crbug.com/441559 virtual/stable/web-animations-api/partial-keyframes-unsupported.html [ Pass ] crbug.com/437696 virtual/stable/web-animations-api/additive-animations-unsupported.html [ Pass ] -crbug.com/571905 css3/filters/effect-reference-hidpi-hw.html [ NeedsRebaseline ] -crbug.com/571905 css3/filters/effect-reference-hw.html [ NeedsRebaseline ] -crbug.com/571905 css3/filters/effect-reference-ordering-hw.html [ NeedsRebaseline ] -crbug.com/571905 css3/filters/effect-reference-subregion-hw.html [ NeedsRebaseline ] -crbug.com/571905 css3/filters/effect-reference-zoom-hw.html [ NeedsRebaseline ] -crbug.com/571905 svg/filters/feDropShadow.svg [ NeedsRebaseline ] - # switching to apache-win32: needs triaging. crbug.com/528062 [ Win ] http/tests/css/missing-repaint-after-slow-style-sheet.pl [ Failure ] crbug.com/528062 [ Win ] http/tests/local/blob/send-data-blob.html [ Failure ] @@ -832,7 +824,6 @@ crbug.com/363099 [ Win ] plugins/open-and-close-window-with-plugin.html [ Failure ] crbug.com/418091 [ Mac10.6 ] fast/text/international/zerowidthjoiner.html [ Failure ] -crbug.com/569938 inspector-protocol/layout-fonts/ogham.html [ NeedsRebaseline ] crbug.com/425345 [ Mac ] fast/text/line-break-after-question-mark.html [ Failure ] @@ -1277,8 +1268,6 @@ crbug.com/568678 [ XP ] virtual/gpu/fast/canvas/canvas-scale-strokePath-shadow.html [ Failure ] -crbug.com/545551 svg/custom/repaint-shadow.svg [ NeedsRebaseline ] - crbug.com/568778 [ XP ] media/video-aspect-ratio.html [ Failure ] crbug.com/568778 [ XP ] media/video-colorspace-yuv420.html [ Failure ] crbug.com/568778 [ XP ] media/video-colorspace-yuv422.html [ Failure ] @@ -1319,6 +1308,8 @@ crbug.com/569514 inspector/sources/debugger-step/debugger-step-into-document-write.html [ NeedsManualRebaseline ] crbug.com/569514 inspector/sources/debugger-step/debugger-step-into-inlined-scripts.html [ NeedsManualRebaseline ] crbug.com/569514 inspector/sources/debugger-step/debugger-step-over-document-write.html [ NeedsManualRebaseline ] +# TODO(yangguo): When the below is rebaselined please uncomment the [ Pass Timeout ] entry for the test. +# See also http://crbug.com/569175. crbug.com/569514 inspector/sources/debugger-step/debugger-step-over-inlined-scripts.html [ NeedsManualRebaseline ] crbug.com/569514 inspector/sources/debugger/debugger-scripts.html [ NeedsManualRebaseline ] @@ -1331,8 +1322,6 @@ crbug.com/571590 fast/repaint/block-layout-inline-children-replaced.html [ Pass Failure ] -crbug.com/571723 svg/W3C-SVG-1.1-SE/color-prop-05-t.svg [ NeedsRebaseline ] - crbug.com/571709 http/tests/inspector/resource-tree/resource-request-content-while-loading.html [ Timeout Pass ] crbug.com/451577 http/tests/inspector/resource-tree/resource-tree-crafted-frame-add.html [ Timeout Pass ] crbug.com/571709 http/tests/inspector/resource-tree/resource-tree-events.html [ Timeout Pass ]
diff --git a/third_party/WebKit/LayoutTests/platform/android/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/android/inspector-protocol/layout-fonts/ogham-expected.txt new file mode 100644 index 0000000..54d7bd58 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -0,0 +1,9 @@ + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghammonofont: +"Segoe UI Symbol" : 29 + + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghamdefaultfont: +"Segoe UI Symbol" : 29 + +There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png new file mode 100644 index 0000000..71c4022 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt new file mode 100644 index 0000000..fb09af6c --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt
@@ -0,0 +1,13 @@ +layer at (0,0) size 480x360 + LayoutView at (0,0) size 480x360 +layer at (0,0) size 480x360 + LayoutSVGRoot {svg} at (0,0) size 480x360 + LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 + LayoutSVGContainer {g} at (120,60) size 150x150 + LayoutSVGContainer {g} at (120,60) size 150x150 + LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#00FF00]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] + LayoutSVGContainer {g} at (10,311) size 228x36 + LayoutSVGText {text} at (10,311) size 228x36 contains 1 chunk(s) + LayoutSVGInlineText {#text} at (0,0) size 228x36 + chunk 1 text run 1 at (10.00,340.00) startOffset 0 endOffset 16 width 228.00: "$Revision: 1.8 $" + LayoutSVGRect {rect} at (0,0) size 480x360 [stroke={[type=SOLID] [color=#000000]}] [x=1.00] [y=1.00] [width=478.00] [height=358.00]
diff --git a/third_party/WebKit/LayoutTests/platform/android/svg/filters/feDropShadow-expected.png b/third_party/WebKit/LayoutTests/platform/android/svg/filters/feDropShadow-expected.png new file mode 100644 index 0000000..b8494a8 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/svg/filters/feDropShadow-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/android/tables/mozilla/bugs/bug3037-1-expected.txt b/third_party/WebKit/LayoutTests/platform/android/tables/mozilla/bugs/bug3037-1-expected.txt new file mode 100644 index 0000000..fb395a70 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/android/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -0,0 +1,40 @@ +layer at (0,0) size 800x600 + LayoutView at (0,0) size 800x600 +layer at (0,0) size 800x600 + LayoutBlockFlow {HTML} at (0,0) size 800x600 + LayoutBlockFlow {BODY} at (8,8) size 784x584 + LayoutBlockFlow (anonymous) at (0,0) size 784x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutBlockFlow (anonymous) at (0,0) size 784x20 + LayoutTable (anonymous) at (0,0) size 32x20 + LayoutTableSection (anonymous) at (0,0) size 32x20 + LayoutTableRow (anonymous) at (0,0) size 32x20 + LayoutTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1] + LayoutInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {HTML:IMG} at (0,0) size 32x19 + LayoutInline {HTML:BR} at (0,0) size 32x19 + LayoutText {#text} at (0,0) size 32x19 + text run at (0,0) width 32: "Back" + LayoutText {#text} at (0,0) size 0x0 + LayoutTableCell {HTML:SPAN} at (32,0) size 0x0 [r=0 c=1 rs=1 cs=1] + LayoutInline {HTML:INPUT} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutBlockFlow (anonymous) at (0,20) size 784x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hidpi-hw-expected.png index 9b017dab..b6f14158 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hidpi-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hidpi-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hw-expected.png index 071b2ac1..3369133 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-ordering-hw-expected.png index aa85f1ea2..77c66dc 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-ordering-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-ordering-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-subregion-hw-expected.png index 0eecc825..310f264 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-subregion-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-subregion-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-zoom-hw-expected.png index e944ef6..7012144 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-zoom-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/css3/filters/effect-reference-zoom-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/inspector-protocol/layout-fonts/ogham-expected.txt new file mode 100644 index 0000000..d3132f3 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/linux/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -0,0 +1,9 @@ + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghammonofont: +"DejaVu Sans" : 29 + + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghamdefaultfont: +"DejaVu Sans" : 29 + +There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png index 71c4022..642a956 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt index fb09af6c..acf897a 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt
@@ -5,7 +5,7 @@ LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 LayoutSVGContainer {g} at (120,60) size 150x150 LayoutSVGContainer {g} at (120,60) size 150x150 - LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#00FF00]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] + LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#FF0000]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] LayoutSVGContainer {g} at (10,311) size 228x36 LayoutSVGText {text} at (10,311) size 228x36 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 228x36
diff --git a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3037-1-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3037-1-expected.txt index fb395a70..4ccec9de 100644 --- a/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3037-1-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/linux/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -3,38 +3,30 @@ layer at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow (anonymous) at (0,0) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,0) size 784x20 - LayoutTable (anonymous) at (0,0) size 32x20 - LayoutTableSection (anonymous) at (0,0) size 32x20 - LayoutTableRow (anonymous) at (0,0) size 32x20 - LayoutTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1] - LayoutInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {HTML:IMG} at (0,0) size 32x19 - LayoutInline {HTML:BR} at (0,0) size 32x19 - LayoutText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "Back" - LayoutText {#text} at (0,0) size 0x0 - LayoutTableCell {HTML:SPAN} at (32,0) size 0x0 [r=0 c=1 rs=1 cs=1] - LayoutInline {HTML:INPUT} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,20) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 + LayoutTable (anonymous) at (0,0) size 32x20 + LayoutTableSection (anonymous) at (0,0) size 32x20 + LayoutTableRow (anonymous) at (0,0) size 32x20 + LayoutTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1] + LayoutInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {HTML:IMG} at (0,0) size 32x19 + LayoutInline {HTML:BR} at (0,0) size 32x19 + LayoutText {#text} at (0,0) size 32x19 + text run at (0,0) width 32: "Back" + LayoutText {#text} at (0,0) size 0x0 + LayoutTableCell {HTML:SPAN} at (32,0) size 0x0 [r=0 c=1 rs=1 cs=1] + LayoutInline {HTML:INPUT} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/mac-lion/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/mac-lion/fast/dynamic/insert-before-table-part-in-continuation-expected.png deleted file mode 100644 index 963299ba..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac-lion/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-lion/svg/custom/repaint-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-lion/svg/custom/repaint-shadow-expected.txt deleted file mode 100644 index 5f1ef34..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac-lion/svg/custom/repaint-shadow-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -X -X
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mavericks/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/mac-mavericks/fast/dynamic/insert-before-table-part-in-continuation-expected.png deleted file mode 100644 index b541166..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac-mavericks/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac-mavericks/svg/custom/repaint-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/mac-mavericks/svg/custom/repaint-shadow-expected.txt deleted file mode 100644 index bbf20a87..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac-mavericks/svg/custom/repaint-shadow-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "contentsOpaque": true, - "drawsContent": true, - "repaintRects": [ - [407, 14, 1, 264], - [171, 14, 237, 264], - [171, 14, 237, 264], - [170, 14, 237, 264], - [170, 14, 237, 264] - ], - "paintInvalidationClients": [ - "RootInlineBox", - "InlineTextBox 'X'", - "LayoutSVGRoot svg", - "LayoutSVGText text", - "LayoutSVGInlineText #text", - "InlineTextBox 'X'" - ] - } - ] -} -
diff --git a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/mac-snowleopard/fast/dynamic/insert-before-table-part-in-continuation-expected.png deleted file mode 100644 index 19201ff..0000000 --- a/third_party/WebKit/LayoutTests/platform/mac-snowleopard/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ /dev/null Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hidpi-hw-expected.png index 787d91a..e63a493 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hidpi-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hidpi-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hw-expected.png index 395e924..700e0f01 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-ordering-hw-expected.png index 14f8340a6..ef7669c9 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-ordering-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-ordering-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png index 9c099da..e167877 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-subregion-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png index 34a14872..86d8f0c 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/css3/filters/effect-reference-zoom-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.png index e1711d9..4ded9e2 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.txt index df052ce..dfbd913 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/fast/dynamic/insert-before-table-part-in-continuation-expected.txt
@@ -1,9 +1,9 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 678 +layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x678 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x678 - LayoutBlockFlow {BODY} at (8,8) size 769x662 - LayoutBlockFlow {P} at (0,0) size 769x18 +layer at (0,0) size 800x600 + LayoutBlockFlow {HTML} at (0,0) size 800x600 + LayoutBlockFlow {BODY} at (8,8) size 784x584 + LayoutBlockFlow {P} at (0,0) size 784x18 LayoutText {#text} at (0,0) size 54x18 text run at (0,0) width 54: "Test for " LayoutInline {I} at (0,0) size 638x18 @@ -15,111 +15,89 @@ text run at (361,0) width 330: "Safari Crashes when opening a JS TreeGrid widget" LayoutText {#text} at (690,0) size 5x18 text run at (690,0) width 5: "." - LayoutBlockFlow {P} at (0,34) size 769x72 - LayoutText {#text} at (0,0) size 766x72 - text run at (0,0) width 686: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a" - text run at (0,18) width 742: "continuation and anonymous table parts get created below and/or above the table parts. Then the test tries to insert a" - text run at (0,36) width 766: "new child into the inline, specifying the table part as the \"before child\". The resulting render tree should look just like it" - text run at (0,54) width 238: "would look if the parent was a block." - LayoutBlockFlow {DIV} at (0,122) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x18 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {P} at (0,34) size 784x72 + LayoutText {#text} at (0,0) size 778x72 + text run at (0,0) width 770: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a continuation" + text run at (0,18) width 778: "and anonymous table parts get created below and/or above the table parts. Then the test tries to insert a new child into the" + text run at (0,36) width 760: "inline, specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the" + text run at (0,54) width 124: "parent was a block." + LayoutBlockFlow {DIV} at (0,122) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x18 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,158) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,140) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1] LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=1 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,194) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,158) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,230) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x18 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,190) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x18 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,266) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,208) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x18 LayoutText {#text} at (0,0) size 41x18 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection (anonymous) at (0,0) size 105x18 - LayoutTableRow (anonymous) at (0,0) size 105x18 - LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x18 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,302) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x18 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x18 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection (anonymous) at (0,0) size 105x18 + LayoutTableRow (anonymous) at (0,0) size 105x18 + LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x18 + text run at (0,0) width 105: "...continues here" + LayoutBlockFlow {DIV} at (0,244) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x18 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,338) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,262) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x0 LayoutTableCell {TD} at (0,0) size 105x0 [r=0 c=0 rs=1 cs=1] @@ -127,76 +105,60 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,374) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,294) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,410) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x18 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,326) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x18 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,446) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,344) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x18 LayoutText {#text} at (0,0) size 41x18 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection (anonymous) at (0,0) size 105x18 - LayoutTableRow {DIV} at (0,0) size 105x18 - LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x18 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,482) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x18 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x18 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection (anonymous) at (0,0) size 105x18 + LayoutTableRow {DIV} at (0,0) size 105x18 + LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x18 + text run at (0,0) width 105: "...continues here" + LayoutBlockFlow {DIV} at (0,380) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x18 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection {DIV} at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,518) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,398) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x0 LayoutTableRow (anonymous) at (0,0) size 105x0 LayoutTableCell {TD} at (0,0) size 105x0 [r=0 c=0 rs=1 cs=1] @@ -205,15 +167,11 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,554) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,430) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x0 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableSection {DIV} at (0,0) size 105x18 @@ -221,35 +179,29 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,590) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x18 - LayoutText {#text} at (0,0) size 41x18 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x18 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,462) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x18 + LayoutText {#text} at (0,0) size 41x18 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x18 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection {DIV} at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x18 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,626) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,480) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x18 LayoutText {#text} at (0,0) size 41x18 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection {DIV} at (0,0) size 105x18 - LayoutTableRow (anonymous) at (0,0) size 105x18 - LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x18 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x18 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection {DIV} at (0,0) size 105x18 + LayoutTableRow (anonymous) at (0,0) size 105x18 + LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x18 + text run at (0,0) width 105: "...continues here"
diff --git a/third_party/WebKit/LayoutTests/platform/mac/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/inspector-protocol/layout-fonts/ogham-expected.txt new file mode 100644 index 0000000..f9975f5a --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/mac/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -0,0 +1,9 @@ + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghammonofont: +"Geneva" : 29 + + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghamdefaultfont: +"Geneva" : 29 + +There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png index 0ad73d3..3aa648a 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png +++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt index 7ae3c37..dc2f701 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt
@@ -5,7 +5,7 @@ LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 LayoutSVGContainer {g} at (120,60) size 150x150 LayoutSVGContainer {g} at (120,60) size 150x150 - LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#00FF00]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] + LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#FF0000]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] LayoutSVGContainer {g} at (10,310) size 230x37 LayoutSVGText {text} at (10,310) size 230x37 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 230x37
diff --git a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3037-1-expected.txt b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3037-1-expected.txt index 515977d..35f9cbb 100644 --- a/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3037-1-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/mac/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -3,38 +3,30 @@ layer at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow (anonymous) at (0,0) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x18 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x18 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x18 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 33x18 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 33x18 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutTable (anonymous) at (0,0) size 33x18 - LayoutTableSection (anonymous) at (0,0) size 33x18 - LayoutTableRow (anonymous) at (0,0) size 33x18 - LayoutTableCell {HTML:SPAN} at (0,0) size 33x18 [r=0 c=0 rs=1 cs=1] - LayoutInline {HTML:BUTTON} at (0,0) size 33x18 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {HTML:IMG} at (0,0) size 33x18 - LayoutInline {HTML:BR} at (0,0) size 33x18 - LayoutText {#text} at (0,0) size 33x18 - text run at (0,0) width 33: "Back" - LayoutText {#text} at (0,0) size 0x0 - LayoutTableCell {HTML:SPAN} at (33,0) size 0x0 [r=0 c=1 rs=1 cs=1] - LayoutInline {HTML:INPUT} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,18) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 + LayoutTable (anonymous) at (0,0) size 33x18 + LayoutTableSection (anonymous) at (0,0) size 33x18 + LayoutTableRow (anonymous) at (0,0) size 33x18 + LayoutTableCell {HTML:SPAN} at (0,0) size 33x18 [r=0 c=0 rs=1 cs=1] + LayoutInline {HTML:BUTTON} at (0,0) size 33x18 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {HTML:IMG} at (0,0) size 33x18 + LayoutInline {HTML:BR} at (0,0) size 33x18 + LayoutText {#text} at (0,0) size 33x18 + text run at (0,0) width 33: "Back" + LayoutText {#text} at (0,0) size 0x0 + LayoutTableCell {HTML:SPAN} at (33,0) size 0x0 [r=0 c=1 rs=1 cs=1] + LayoutInline {HTML:INPUT} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-hw-expected.png index b2bc9ef..0187b0f 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-subregion-hw-expected.png index 2008f9af..b42350e 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-subregion-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/css3/filters/effect-reference-subregion-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.png index 167950f..ab8f5421 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.txt index 4aae4679..17466703 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/fast/dynamic/insert-before-table-part-in-continuation-expected.txt
@@ -1,9 +1,9 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 748 +layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x748 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x748 - LayoutBlockFlow {BODY} at (8,8) size 769x732 - LayoutBlockFlow {P} at (0,0) size 769x20 +layer at (0,0) size 800x600 + LayoutBlockFlow {HTML} at (0,0) size 800x600 + LayoutBlockFlow {BODY} at (8,8) size 784x584 + LayoutBlockFlow {P} at (0,0) size 784x20 LayoutText {#text} at (0,0) size 51x19 text run at (0,0) width 51: "Test for " LayoutInline {I} at (0,0) size 638x19 @@ -15,111 +15,88 @@ text run at (360,0) width 329: "Safari Crashes when opening a JS TreeGrid widget" LayoutText {#text} at (689,0) size 4x19 text run at (689,0) width 4: "." - LayoutBlockFlow {P} at (0,36) size 769x80 - LayoutText {#text} at (0,0) size 744x79 + LayoutBlockFlow {P} at (0,36) size 784x60 + LayoutText {#text} at (0,0) size 783x59 text run at (0,0) width 739: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a continuation and" text run at (0,20) width 744: "anonymous table parts get created below and/or above the table parts. Then the test tries to insert a new child into the inline," - text run at (0,40) width 741: "specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the parent was a" - text run at (0,60) width 38: "block." - LayoutBlockFlow {DIV} at (0,132) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 123x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutText {#text} at (39,0) size 84x19 - text run at (39,0) width 84: "goes here and" - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + text run at (0,40) width 783: "specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the parent was a block." + LayoutBlockFlow {DIV} at (0,112) size 784x20 + LayoutInline {SPAN} at (0,0) size 221x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutText {#text} at (39,0) size 84x19 + text run at (39,0) width 84: "goes here and" + LayoutTable (anonymous) at (123,0) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,172) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,132) size 784x20 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,0) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1] LayoutTableCell {DIV} at (0,0) size 98x20 [r=0 c=1 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,212) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,152) size 784x35 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,15) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow {TR} at (0,0) size 98x0 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell {DIV} at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,252) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutInline {SPAN} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,187) size 784x20 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutInline {SPAN} at (0,0) size 0x19 + LayoutTable (anonymous) at (39,0) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,292) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 + LayoutBlockFlow {DIV} at (0,207) size 784x40 + LayoutBlockFlow (anonymous) at (0,0) size 784x20 LayoutInline {SPAN} at (0,0) size 39x19 LayoutText {#text} at (0,0) size 39x19 text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 98x20 - LayoutTableSection (anonymous) at (0,0) size 98x20 - LayoutTableRow (anonymous) at (0,0) size 98x20 - LayoutTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 98x19 - text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,332) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 123x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutText {#text} at (39,0) size 84x19 - text run at (39,0) width 84: "goes here and" - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow (anonymous) at (0,20) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,20) size 784x20 + LayoutInline {SPAN} at (0,0) size 98x19 + LayoutTable (anonymous) at (0,0) size 98x20 + LayoutTableSection (anonymous) at (0,0) size 98x20 + LayoutTableRow (anonymous) at (0,0) size 98x20 + LayoutTableCell {DIV} at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 98x19 + text run at (0,0) width 98: "...continues here" + LayoutBlockFlow {DIV} at (0,247) size 784x20 + LayoutInline {SPAN} at (0,0) size 221x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutText {#text} at (39,0) size 84x19 + text run at (39,0) width 84: "goes here and" + LayoutTable (anonymous) at (123,0) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow {DIV} at (0,0) size 98x20 LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,372) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,267) size 784x35 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,15) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x0 LayoutTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1] @@ -127,76 +104,60 @@ LayoutTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,412) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,302) size 784x35 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,15) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow {TR} at (0,0) size 98x0 LayoutTableRow {DIV} at (0,0) size 98x20 LayoutTableCell (anonymous) at (0,0) size 98x20 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,452) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutInline {SPAN} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,337) size 784x20 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutInline {SPAN} at (0,0) size 0x19 + LayoutTable (anonymous) at (39,0) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x20 LayoutTableRow {DIV} at (0,0) size 98x20 LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,492) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 + LayoutBlockFlow {DIV} at (0,357) size 784x40 + LayoutBlockFlow (anonymous) at (0,0) size 784x20 LayoutInline {SPAN} at (0,0) size 39x19 LayoutText {#text} at (0,0) size 39x19 text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 98x20 - LayoutTableSection (anonymous) at (0,0) size 98x20 - LayoutTableRow {DIV} at (0,0) size 98x20 - LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 98x19 - text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,532) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 123x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutText {#text} at (39,0) size 84x19 - text run at (39,0) width 84: "goes here and" - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow (anonymous) at (0,20) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,20) size 784x20 + LayoutInline {SPAN} at (0,0) size 98x19 + LayoutTable (anonymous) at (0,0) size 98x20 + LayoutTableSection (anonymous) at (0,0) size 98x20 + LayoutTableRow {DIV} at (0,0) size 98x20 + LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 98x19 + text run at (0,0) width 98: "...continues here" + LayoutBlockFlow {DIV} at (0,397) size 784x20 + LayoutInline {SPAN} at (0,0) size 221x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutText {#text} at (39,0) size 84x19 + text run at (39,0) width 84: "goes here and" + LayoutTable (anonymous) at (123,0) size 98x20 LayoutTableSection {DIV} at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,572) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,417) size 784x35 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,15) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x0 LayoutTableRow (anonymous) at (0,0) size 98x0 LayoutTableCell {TD} at (0,0) size 98x0 [r=0 c=0 rs=1 cs=1] @@ -205,15 +166,11 @@ LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,612) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,452) size 784x35 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutTable (anonymous) at (39,15) size 98x20 LayoutTableSection (anonymous) at (0,0) size 98x0 LayoutTableRow {TR} at (0,0) size 98x0 LayoutTableSection {DIV} at (0,0) size 98x20 @@ -221,35 +178,29 @@ LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,652) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 - LayoutInline {SPAN} at (0,0) size 39x19 - LayoutText {#text} at (0,0) size 39x19 - text run at (0,0) width 39: "Text..." - LayoutInline {SPAN} at (0,0) size 0x19 - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutTable (anonymous) at (0,0) size 98x20 + LayoutBlockFlow {DIV} at (0,487) size 784x20 + LayoutInline {SPAN} at (0,0) size 137x19 + LayoutText {#text} at (0,0) size 39x19 + text run at (0,0) width 39: "Text..." + LayoutInline {SPAN} at (0,0) size 0x19 + LayoutTable (anonymous) at (39,0) size 98x20 LayoutTableSection {DIV} at (0,0) size 98x20 LayoutTableRow (anonymous) at (0,0) size 98x20 LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 98x19 text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,692) size 769x40 - LayoutBlockFlow (anonymous) at (0,0) size 769x20 + LayoutBlockFlow {DIV} at (0,507) size 784x40 + LayoutBlockFlow (anonymous) at (0,0) size 784x20 LayoutInline {SPAN} at (0,0) size 39x19 LayoutText {#text} at (0,0) size 39x19 text run at (0,0) width 39: "Text..." - LayoutBlockFlow (anonymous) at (0,20) size 769x20 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 98x20 - LayoutTableSection {DIV} at (0,0) size 98x20 - LayoutTableRow (anonymous) at (0,0) size 98x20 - LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 98x19 - text run at (0,0) width 98: "...continues here" - LayoutBlockFlow (anonymous) at (0,40) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow (anonymous) at (0,20) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,20) size 784x20 + LayoutInline {SPAN} at (0,0) size 98x19 + LayoutTable (anonymous) at (0,0) size 98x20 + LayoutTableSection {DIV} at (0,0) size 98x20 + LayoutTableRow (anonymous) at (0,0) size 98x20 + LayoutTableCell (anonymous) at (0,0) size 98x20 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 98x19 + text run at (0,0) width 98: "...continues here"
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/inspector-protocol/layout-fonts/ogham-expected.txt new file mode 100644 index 0000000..a371847 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/win-xp/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -0,0 +1,9 @@ + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghammonofont: +"Arial" : 29 + + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghamdefaultfont: +"Arial" : 29 + +There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png index 783780e..ba8d95d 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt index fb09af6c..acf897a 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt
@@ -5,7 +5,7 @@ LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 LayoutSVGContainer {g} at (120,60) size 150x150 LayoutSVGContainer {g} at (120,60) size 150x150 - LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#00FF00]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] + LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#FF0000]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] LayoutSVGContainer {g} at (10,311) size 228x36 LayoutSVGText {text} at (10,311) size 228x36 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 228x36
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.png b/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.png index e2ff7ce..21ba2be 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.txt deleted file mode 100644 index 5f1ef34..0000000 --- a/third_party/WebKit/LayoutTests/platform/win-xp/svg/custom/repaint-shadow-expected.txt +++ /dev/null
@@ -1,2 +0,0 @@ -X -X
diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/tables/mozilla/bugs/bug3037-1-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/tables/mozilla/bugs/bug3037-1-expected.txt index fb395a70..4ccec9de 100644 --- a/third_party/WebKit/LayoutTests/platform/win-xp/tables/mozilla/bugs/bug3037-1-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win-xp/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -3,38 +3,30 @@ layer at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow (anonymous) at (0,0) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 32x19 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,0) size 784x20 - LayoutTable (anonymous) at (0,0) size 32x20 - LayoutTableSection (anonymous) at (0,0) size 32x20 - LayoutTableRow (anonymous) at (0,0) size 32x20 - LayoutTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1] - LayoutInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {HTML:IMG} at (0,0) size 32x19 - LayoutInline {HTML:BR} at (0,0) size 32x19 - LayoutText {#text} at (0,0) size 32x19 - text run at (0,0) width 32: "Back" - LayoutText {#text} at (0,0) size 0x0 - LayoutTableCell {HTML:SPAN} at (32,0) size 0x0 [r=0 c=1 rs=1 cs=1] - LayoutInline {HTML:INPUT} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,20) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 + LayoutTable (anonymous) at (0,0) size 32x20 + LayoutTableSection (anonymous) at (0,0) size 32x20 + LayoutTableRow (anonymous) at (0,0) size 32x20 + LayoutTableCell {HTML:SPAN} at (0,0) size 32x20 [r=0 c=0 rs=1 cs=1] + LayoutInline {HTML:BUTTON} at (0,0) size 32x19 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {HTML:IMG} at (0,0) size 32x19 + LayoutInline {HTML:BR} at (0,0) size 32x19 + LayoutText {#text} at (0,0) size 32x19 + text run at (0,0) width 32: "Back" + LayoutText {#text} at (0,0) size 0x0 + LayoutTableCell {HTML:SPAN} at (32,0) size 0x0 [r=0 c=1 rs=1 cs=1] + LayoutInline {HTML:INPUT} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png index 39bd113..8665483 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hidpi-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hw-expected.png index c783e55..1b92c544 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png index 0c58371..03b56e0 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-ordering-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-subregion-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-subregion-hw-expected.png index 9ed0258..77b7e29 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-subregion-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-subregion-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png index 9a7deaa7..68dd853 100644 --- a/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/css3/filters/effect-reference-zoom-hw-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.png b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.png index ea2d207..c3986a8 100644 --- a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt index 5fd5afa..961e93a 100644 --- a/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/fast/dynamic/insert-before-table-part-in-continuation-expected.txt
@@ -1,9 +1,9 @@ -layer at (0,0) size 800x600 clip at (0,0) size 785x600 scrollHeight 678 +layer at (0,0) size 800x600 LayoutView at (0,0) size 800x600 -layer at (0,0) size 785x678 backgroundClip at (0,0) size 785x600 clip at (0,0) size 785x600 - LayoutBlockFlow {HTML} at (0,0) size 785x678 - LayoutBlockFlow {BODY} at (8,8) size 769x662 - LayoutBlockFlow {P} at (0,0) size 769x18 +layer at (0,0) size 800x600 + LayoutBlockFlow {HTML} at (0,0) size 800x600 + LayoutBlockFlow {BODY} at (8,8) size 784x584 + LayoutBlockFlow {P} at (0,0) size 784x18 LayoutText {#text} at (0,0) size 54x17 text run at (0,0) width 54: "Test for " LayoutInline {I} at (0,0) size 638x17 @@ -15,111 +15,89 @@ text run at (361,0) width 330: "Safari Crashes when opening a JS TreeGrid widget" LayoutText {#text} at (690,0) size 5x17 text run at (690,0) width 5: "." - LayoutBlockFlow {P} at (0,34) size 769x72 - LayoutText {#text} at (0,0) size 766x71 - text run at (0,0) width 686: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a" - text run at (0,18) width 742: "continuation and anonymous table parts get created below and/or above the table parts. Then the test tries to insert a" - text run at (0,36) width 766: "new child into the inline, specifying the table part as the \"before child\". The resulting render tree should look just like it" - text run at (0,54) width 238: "would look if the parent was a block." - LayoutBlockFlow {DIV} at (0,122) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x17 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {P} at (0,34) size 784x72 + LayoutText {#text} at (0,0) size 778x71 + text run at (0,0) width 770: "The test sets up an inline parent with a child that is some kind of table part. The child gets broken off into a continuation" + text run at (0,18) width 778: "and anonymous table parts get created below and/or above the table parts. Then the test tries to insert a new child into the" + text run at (0,36) width 760: "inline, specifying the table part as the \"before child\". The resulting render tree should look just like it would look if the" + text run at (0,54) width 124: "parent was a block." + LayoutBlockFlow {DIV} at (0,122) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x17 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,158) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,140) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {TD} at (0,0) size 0x0 [r=0 c=0 rs=1 cs=1] LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=1 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,194) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,158) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,230) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x17 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,190) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x17 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,266) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,208) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x17 LayoutText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection (anonymous) at (0,0) size 105x18 - LayoutTableRow (anonymous) at (0,0) size 105x18 - LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x17 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,302) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x17 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x17 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection (anonymous) at (0,0) size 105x18 + LayoutTableRow (anonymous) at (0,0) size 105x18 + LayoutTableCell {DIV} at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x17 + text run at (0,0) width 105: "...continues here" + LayoutBlockFlow {DIV} at (0,244) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x17 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,338) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,262) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x0 LayoutTableCell {TD} at (0,0) size 105x0 [r=0 c=0 rs=1 cs=1] @@ -127,76 +105,60 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,374) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,294) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=1 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,410) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x17 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,326) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x17 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x18 LayoutTableRow {DIV} at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,446) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,344) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x17 LayoutText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection (anonymous) at (0,0) size 105x18 - LayoutTableRow {DIV} at (0,0) size 105x18 - LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x17 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,482) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 129x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutText {#text} at (40,0) size 89x17 - text run at (40,0) width 89: "goes here and" - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x17 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection (anonymous) at (0,0) size 105x18 + LayoutTableRow {DIV} at (0,0) size 105x18 + LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x17 + text run at (0,0) width 105: "...continues here" + LayoutBlockFlow {DIV} at (0,380) size 784x18 + LayoutInline {SPAN} at (0,0) size 234x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutText {#text} at (40,0) size 89x17 + text run at (40,0) width 89: "goes here and" + LayoutTable (anonymous) at (128.16,0) size 105x18 LayoutTableSection {DIV} at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,518) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,398) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x0 LayoutTableRow (anonymous) at (0,0) size 105x0 LayoutTableCell {TD} at (0,0) size 105x0 [r=0 c=0 rs=1 cs=1] @@ -205,15 +167,11 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,554) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,430) size 784x32 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutTable (anonymous) at (40.20,14) size 105x18 LayoutTableSection (anonymous) at (0,0) size 105x0 LayoutTableRow {TR} at (0,0) size 105x0 LayoutTableSection {DIV} at (0,0) size 105x18 @@ -221,35 +179,29 @@ LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,590) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 - LayoutInline {SPAN} at (0,0) size 41x17 - LayoutText {#text} at (0,0) size 41x17 - text run at (0,0) width 41: "Text..." - LayoutInline {SPAN} at (0,0) size 1x17 - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutTable (anonymous) at (0,0) size 105x18 + LayoutBlockFlow {DIV} at (0,462) size 784x18 + LayoutInline {SPAN} at (0,0) size 146x17 + LayoutText {#text} at (0,0) size 41x17 + text run at (0,0) width 41: "Text..." + LayoutInline {SPAN} at (0,0) size 1x17 + LayoutTable (anonymous) at (40.20,0) size 105x18 LayoutTableSection {DIV} at (0,0) size 105x18 LayoutTableRow (anonymous) at (0,0) size 105x18 LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] LayoutText {#text} at (0,0) size 105x17 text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 - LayoutBlockFlow {DIV} at (0,626) size 769x36 - LayoutBlockFlow (anonymous) at (0,0) size 769x18 + LayoutBlockFlow {DIV} at (0,480) size 784x36 + LayoutBlockFlow (anonymous) at (0,0) size 784x18 LayoutInline {SPAN} at (0,0) size 41x17 LayoutText {#text} at (0,0) size 41x17 text run at (0,0) width 41: "Text..." - LayoutBlockFlow (anonymous) at (0,18) size 769x18 - LayoutBlockFlow {DIV} at (0,0) size 769x0 - LayoutTable (anonymous) at (0,0) size 105x18 - LayoutTableSection {DIV} at (0,0) size 105x18 - LayoutTableRow (anonymous) at (0,0) size 105x18 - LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] - LayoutText {#text} at (0,0) size 105x17 - text run at (0,0) width 105: "...continues here" - LayoutBlockFlow (anonymous) at (0,36) size 769x0 - LayoutInline {SPAN} at (0,0) size 0x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x0 + LayoutBlockFlow {DIV} at (0,0) size 784x0 + LayoutBlockFlow (anonymous) at (0,18) size 784x18 + LayoutInline {SPAN} at (0,0) size 105x17 + LayoutTable (anonymous) at (0,0) size 105x18 + LayoutTableSection {DIV} at (0,0) size 105x18 + LayoutTableRow (anonymous) at (0,0) size 105x18 + LayoutTableCell (anonymous) at (0,0) size 105x18 [r=0 c=0 rs=1 cs=1] + LayoutText {#text} at (0,0) size 105x17 + text run at (0,0) width 105: "...continues here"
diff --git a/third_party/WebKit/LayoutTests/platform/win/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/win/inspector-protocol/layout-fonts/ogham-expected.txt index 54d7bd58..a371847 100644 --- a/third_party/WebKit/LayoutTests/platform/win/inspector-protocol/layout-fonts/ogham-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -1,9 +1,9 @@ ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ #oghammonofont: -"Segoe UI Symbol" : 29 +"Arial" : 29 ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ #oghamdefaultfont: -"Segoe UI Symbol" : 29 +"Arial" : 29 There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png index a915ddd..c44d7eb 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png +++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.png Binary files differ
diff --git a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt index fc7f5d7..f69312e 100644 --- a/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/svg/W3C-SVG-1.1-SE/color-prop-05-t-expected.txt
@@ -5,7 +5,7 @@ LayoutSVGHiddenContainer {defs} at (0,0) size 0x0 LayoutSVGContainer {g} at (120,60) size 150x150 LayoutSVGContainer {g} at (120,60) size 150x150 - LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#00FF00]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] + LayoutSVGRect {rect} at (120,60) size 150x150 [fill={[type=SOLID] [color=#FF0000]}] [x=120.00] [y=60.00] [width=150.00] [height=150.00] LayoutSVGContainer {g} at (10,311) size 230x36 LayoutSVGText {text} at (10,311) size 230x36 contains 1 chunk(s) LayoutSVGInlineText {#text} at (0,0) size 230x36
diff --git a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3037-1-expected.txt b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3037-1-expected.txt index 735cbb9..395ac862 100644 --- a/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3037-1-expected.txt +++ b/third_party/WebKit/LayoutTests/platform/win/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -3,38 +3,30 @@ layer at (0,0) size 800x600 LayoutBlockFlow {HTML} at (0,0) size 800x600 LayoutBlockFlow {BODY} at (8,8) size 784x584 - LayoutBlockFlow (anonymous) at (0,0) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x17 + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x17 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {WINDOW} at (0,0) size 33x17 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBOX} at (0,0) size 33x17 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 + LayoutInline {XUL:TOOLBAR} at (0,0) size 33x17 LayoutText {#text} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,0) size 784x18 - LayoutTable (anonymous) at (0,0) size 33x18 - LayoutTableSection (anonymous) at (0,0) size 33x18 - LayoutTableRow (anonymous) at (0,0) size 33x18 - LayoutTableCell {HTML:SPAN} at (0,0) size 33x18 [r=0 c=0 rs=1 cs=1] - LayoutInline {HTML:BUTTON} at (0,0) size 33x17 [bgcolor=#C0C0C0] - LayoutText {#text} at (0,0) size 0x0 - LayoutInline {HTML:IMG} at (0,0) size 33x17 - LayoutInline {HTML:BR} at (0,0) size 33x17 - LayoutText {#text} at (0,0) size 33x17 - text run at (0,0) width 33: "Back" - LayoutText {#text} at (0,0) size 0x0 - LayoutTableCell {HTML:SPAN} at (33,0) size 0x0 [r=0 c=1 rs=1 cs=1] - LayoutInline {HTML:INPUT} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 - LayoutBlockFlow (anonymous) at (0,18) size 784x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {WINDOW} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBOX} at (0,0) size 0x0 - LayoutInline {XUL:TOOLBAR} at (0,0) size 0x0 - LayoutText {#text} at (0,0) size 0x0 + LayoutTable (anonymous) at (0,0) size 33x18 + LayoutTableSection (anonymous) at (0,0) size 33x18 + LayoutTableRow (anonymous) at (0,0) size 33x18 + LayoutTableCell {HTML:SPAN} at (0,0) size 33x18 [r=0 c=0 rs=1 cs=1] + LayoutInline {HTML:BUTTON} at (0,0) size 33x17 [bgcolor=#C0C0C0] + LayoutText {#text} at (0,0) size 0x0 + LayoutInline {HTML:IMG} at (0,0) size 33x17 + LayoutInline {HTML:BR} at (0,0) size 33x17 + LayoutText {#text} at (0,0) size 33x17 + text run at (0,0) width 33: "Back" + LayoutText {#text} at (0,0) size 0x0 + LayoutTableCell {HTML:SPAN} at (33,0) size 0x0 [r=0 c=1 rs=1 cs=1] + LayoutInline {HTML:INPUT} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 LayoutText {#text} at (0,0) size 0x0 + LayoutText {#text} at (0,0) size 0x0
diff --git a/third_party/WebKit/LayoutTests/platform/win7/inspector-protocol/layout-fonts/ogham-expected.txt b/third_party/WebKit/LayoutTests/platform/win7/inspector-protocol/layout-fonts/ogham-expected.txt new file mode 100644 index 0000000..54d7bd58 --- /dev/null +++ b/third_party/WebKit/LayoutTests/platform/win7/inspector-protocol/layout-fonts/ogham-expected.txt
@@ -0,0 +1,9 @@ + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghammonofont: +"Segoe UI Symbol" : 29 + + ᚁᚂᚃᚄᚅᚆᚇᚈᚉᚊᚋᚌᚍᚎᚏᚐᚑᚒᚓᚔᚕᚖᚗᚘᚙᚚ᚛᚜ +#oghamdefaultfont: +"Segoe UI Symbol" : 29 + +There should be two lines of Ogham above.
diff --git a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/repaint-shadow-expected.txt b/third_party/WebKit/LayoutTests/platform/win7/svg/custom/repaint-shadow-expected.txt deleted file mode 100644 index 3d8223a..0000000 --- a/third_party/WebKit/LayoutTests/platform/win7/svg/custom/repaint-shadow-expected.txt +++ /dev/null
@@ -1,26 +0,0 @@ -{ - "bounds": [800, 600], - "children": [ - { - "bounds": [800, 600], - "contentsOpaque": true, - "drawsContent": true, - "repaintRects": [ - [412, 15, 1, 261], - [171, 15, 242, 261], - [171, 15, 242, 261], - [170, 15, 242, 261], - [170, 15, 242, 261] - ], - "paintInvalidationClients": [ - "RootInlineBox", - "InlineTextBox 'X'", - "LayoutSVGRoot svg", - "LayoutSVGText text", - "LayoutSVGInlineText #text", - "InlineTextBox 'X'" - ] - } - ] -} -
diff --git a/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png b/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png index b8494a8..b1c94f9 100644 --- a/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png +++ b/third_party/WebKit/LayoutTests/svg/filters/feDropShadow-expected.png Binary files differ
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py index a3f161e..d49fe4c4 100644 --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
@@ -679,27 +679,17 @@ def add_expectation_line(self, expectation_line, model_all_expectations=False): + """Returns a list of warnings encountered while matching specifiers.""" + if expectation_line.is_invalid(): return for test in expectation_line.matching_tests: - lines_involve_rebaseline = False - prev_expectation_line = self.get_expectation_line(test) + if self._already_seen_better_match(test, expectation_line): + continue - if prev_expectation_line: - # The previous path matched more of the test. - if len(prev_expectation_line.path) > len(expectation_line.path): - continue - - if self._lines_conflict(prev_expectation_line, expectation_line): - continue - - lines_involve_rebaseline = self._expects_rebaseline(prev_expectation_line) or self._expects_rebaseline(expectation_line) - - # Exact path matches that conflict should be merged, e.g. - # [ Pass Timeout ] + [ NeedsRebaseline ] ==> [ Pass Timeout NeedsRebaseline ]. - if model_all_expectations or lines_involve_rebaseline: - expectation_line = TestExpectationLine.merge_expectation_lines(prev_expectation_line, expectation_line, model_all_expectations) + if model_all_expectations: + expectation_line = TestExpectationLine.merge_expectation_lines(self.get_expectation_line(test), expectation_line, model_all_expectations) self._clear_expectations_for_test(test) self._test_to_expectation_line[test] = expectation_line @@ -753,20 +743,41 @@ if test in set_of_tests: set_of_tests.remove(test) - def _expects_rebaseline(self, expectation_line): - expectations = expectation_line.parsed_expectations - return REBASELINE in expectations or NEEDS_REBASELINE in expectations or NEEDS_MANUAL_REBASELINE in expectations + def _already_seen_better_match(self, test, expectation_line): + """Returns whether we've seen a better match already in the file. - def _lines_conflict(self, prev_expectation_line, expectation_line): - if prev_expectation_line.path != expectation_line.path: + Returns True if we've already seen a expectation_line.name that matches more of the test + than this path does + """ + # FIXME: See comment below about matching test configs and specificity. + if not self.has_test(test): + # We've never seen this test before. return False - if PASS in expectation_line.parsed_expectations and self._expects_rebaseline(prev_expectation_line): + prev_expectation_line = self._test_to_expectation_line[test] + + if prev_expectation_line.filename != expectation_line.filename: + # We've moved on to a new expectation file, which overrides older ones. return False - if PASS in prev_expectation_line.parsed_expectations and self._expects_rebaseline(expectation_line): + if len(prev_expectation_line.path) > len(expectation_line.path): + # The previous path matched more of the test. + return True + + if len(prev_expectation_line.path) < len(expectation_line.path): + # This path matches more of the test. return False + # At this point we know we have seen a previous exact match on this + # base path, so we need to check the two sets of specifiers. + + # FIXME: This code was originally designed to allow lines that matched + # more specifiers to override lines that matched fewer specifiers. + # However, we currently view these as errors. + # + # To use the "more specifiers wins" policy, change the errors for overrides + # to be warnings and return False". + if prev_expectation_line.matching_configurations == expectation_line.matching_configurations: expectation_line.warnings.append('Duplicate or ambiguous entry lines %s:%s and %s:%s.' % ( self._shorten_filename(prev_expectation_line.filename), prev_expectation_line.line_numbers,
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py index 33749d5..3fb7006 100644 --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/models/test_expectations_unittest.py
@@ -480,10 +480,6 @@ Bug(exp) failures/expected/text.html [ Failure ] Bug(exp) failures/expected/text.html [ Timeout ]""", is_lint_mode=True) - self.assertRaises(ParseError, self.parse_exp, """ -Bug(exp) failures/expected/text.html [ Failure ] -Bug(exp) failures/expected/text.html [ NeedsRebaseline ]""", is_lint_mode=True) - self.assertRaises(ParseError, self.parse_exp, self.get_basic_expectations(), overrides=""" Bug(override) failures/expected/text.html [ Failure ] @@ -495,51 +491,6 @@ Bug(exp) [ Debug ] failures/expected/text.html [ Failure ] """) - def test_duplicates_rebaseline_no_conflict(self): - # Rebaseline throws in lint mode, so only test it in non-lint mode. - # Check Rebaseline - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ Rebaseline ] -Bug(exp) failures/expected/text.html [ Pass Failure ] -""", is_lint_mode=False) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, REBASELINE]) - - # Check NeedsRebaseline. - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ Pass Failure ] -Bug(exp) failures/expected/text.html [ NeedsRebaseline ] -""", is_lint_mode=False) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, NEEDS_REBASELINE]) - - # Check NeedsManualRebaseline - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ Pass Failure ] -Bug(exp) failures/expected/text.html [ NeedsManualRebaseline ] -""", is_lint_mode=False) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, NEEDS_MANUAL_REBASELINE]) - - def test_duplicates_rebaseline_no_conflict_linting(self): - # Check NeedsRebaseline - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ NeedsRebaseline ] -Bug(exp) failures/expected/text.html [ Pass Failure ] -""", is_lint_mode=True) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, NEEDS_REBASELINE]) - - # Check lines in reverse order. - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ Pass Failure ] -Bug(exp) failures/expected/text.html [ NeedsRebaseline ] -""", is_lint_mode=True) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, NEEDS_REBASELINE]) - - # Check NeedsManualRebaseline - self.parse_exp(""" -Bug(exp) failures/expected/text.html [ Pass Failure ] -Bug(exp) failures/expected/text.html [ NeedsManualRebaseline ] -""", is_lint_mode=True) - self.assert_exp_list('failures/expected/text.html', [PASS, FAIL, NEEDS_MANUAL_REBASELINE]) - def test_missing_file(self): self.parse_exp('Bug(test) missing_file.html [ Failure ]') self.assertTrue(self._exp.has_warnings(), 1)
diff --git a/third_party/crashpad/README.chromium b/third_party/crashpad/README.chromium index 488a14e..8cd2e50 100644 --- a/third_party/crashpad/README.chromium +++ b/third_party/crashpad/README.chromium
@@ -35,4 +35,5 @@ $ git am --3way --message-id -p4 /tmp/patchdir Local Modifications: -None. +- Removed references to "base/basictypes.h" and replaced them with appropriate + headers.
diff --git a/third_party/crashpad/crashpad/client/capture_context_mac.h b/third_party/crashpad/crashpad/client/capture_context_mac.h index 74e440e..934266e9 100644 --- a/third_party/crashpad/crashpad/client/capture_context_mac.h +++ b/third_party/crashpad/crashpad/client/capture_context_mac.h
@@ -16,6 +16,7 @@ #define CRASHPAD_CLIENT_CAPTURE_CONTEXT_MAC_H_ #include <mach/mach.h> +#include <stdint.h> #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/client/crash_report_database.h b/third_party/crashpad/crashpad/client/crash_report_database.h index 1897d2e..550fd3c 100644 --- a/third_party/crashpad/crashpad/client/crash_report_database.h +++ b/third_party/crashpad/crashpad/client/crash_report_database.h
@@ -20,8 +20,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/file/file_io.h" #include "util/misc/uuid.h"
diff --git a/third_party/crashpad/crashpad/client/crash_report_database_mac.mm b/third_party/crashpad/crashpad/client/crash_report_database_mac.mm index 80cc5cd..f36356c 100644 --- a/third_party/crashpad/crashpad/client/crash_report_database_mac.mm +++ b/third_party/crashpad/crashpad/client/crash_report_database_mac.mm
@@ -17,6 +17,7 @@ #include <errno.h> #include <fcntl.h> #import <Foundation/Foundation.h> +#include <stddef.h> #include <stdio.h> #include <sys/stat.h> #include <sys/types.h> @@ -26,6 +27,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsautorelease_pool.h" +#include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/scoped_generic.h" #include "base/strings/string_piece.h"
diff --git a/third_party/crashpad/crashpad/client/crash_report_database_test.cc b/third_party/crashpad/crashpad/client/crash_report_database_test.cc index ca839f4..3517330 100644 --- a/third_party/crashpad/crashpad/client/crash_report_database_test.cc +++ b/third_party/crashpad/crashpad/client/crash_report_database_test.cc
@@ -14,6 +14,7 @@ #include "client/crash_report_database.h" +#include "base/macros.h" #include "build/build_config.h" #include "client/settings.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/client/crash_report_database_win.cc b/third_party/crashpad/crashpad/client/crash_report_database_win.cc index d7968bd..fa71796 100644 --- a/third_party/crashpad/crashpad/client/crash_report_database_win.cc +++ b/third_party/crashpad/crashpad/client/crash_report_database_win.cc
@@ -14,6 +14,8 @@ #include "client/crash_report_database.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <time.h> #include <windows.h> @@ -21,6 +23,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_math.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h"
diff --git a/third_party/crashpad/crashpad/client/crashpad_client.h b/third_party/crashpad/crashpad/client/crashpad_client.h index 79a4900e..28a87a3 100644 --- a/third_party/crashpad/crashpad/client/crashpad_client.h +++ b/third_party/crashpad/crashpad/client/crashpad_client.h
@@ -19,8 +19,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "build/build_config.h" #if defined(OS_MACOSX)
diff --git a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc index cce11d1..e35b503 100644 --- a/third_party/crashpad/crashpad/client/crashpad_client_mac.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_mac.cc
@@ -17,6 +17,7 @@ #include <errno.h> #include <mach/mach.h> #include <pthread.h> +#include <stdint.h> #include <sys/wait.h> #include <unistd.h> @@ -24,6 +25,7 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" +#include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" #include "util/mac/mac_util.h"
diff --git a/third_party/crashpad/crashpad/client/crashpad_client_win.cc b/third_party/crashpad/crashpad/client/crashpad_client_win.cc index c7cb09a..b627796a 100644 --- a/third_party/crashpad/crashpad/client/crashpad_client_win.cc +++ b/third_party/crashpad/crashpad/client/crashpad_client_win.cc
@@ -14,6 +14,7 @@ #include "client/crashpad_client.h" +#include <stdint.h> #include <string.h> #include <windows.h> @@ -25,6 +26,7 @@ #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" #include "util/file/file_io.h" #include "util/win/command_line.h" #include "util/win/critical_section_with_debug_info.h"
diff --git a/third_party/crashpad/crashpad/client/crashpad_info.cc b/third_party/crashpad/crashpad/client/crashpad_info.cc index 596f349..db71cc9 100644 --- a/third_party/crashpad/crashpad/client/crashpad_info.cc +++ b/third_party/crashpad/crashpad/client/crashpad_info.cc
@@ -14,6 +14,7 @@ #include "client/crashpad_info.h" +#include "build/build_config.h" #include "util/stdlib/cxx.h" #if defined(OS_MACOSX)
diff --git a/third_party/crashpad/crashpad/client/crashpad_info.h b/third_party/crashpad/crashpad/client/crashpad_info.h index c2182c0..1c4997ab 100644 --- a/third_party/crashpad/crashpad/client/crashpad_info.h +++ b/third_party/crashpad/crashpad/client/crashpad_info.h
@@ -15,10 +15,9 @@ #ifndef CRASHPAD_CLIENT_CRASHPAD_INFO_H_ #define CRASHPAD_CLIENT_CRASHPAD_INFO_H_ -#include "base/basictypes.h" - #include <stdint.h> +#include "base/macros.h" #include "build/build_config.h" #include "client/simple_string_dictionary.h" #include "util/misc/tri_state.h"
diff --git a/third_party/crashpad/crashpad/client/prune_crash_reports.cc b/third_party/crashpad/crashpad/client/prune_crash_reports.cc index d94f212..0339249 100644 --- a/third_party/crashpad/crashpad/client/prune_crash_reports.cc +++ b/third_party/crashpad/crashpad/client/prune_crash_reports.cc
@@ -20,6 +20,7 @@ #include <vector> #include "base/logging.h" +#include "build/build_config.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/client/prune_crash_reports.h b/third_party/crashpad/crashpad/client/prune_crash_reports.h index 1c1ce9c..fcef135 100644 --- a/third_party/crashpad/crashpad/client/prune_crash_reports.h +++ b/third_party/crashpad/crashpad/client/prune_crash_reports.h
@@ -15,9 +15,11 @@ #ifndef CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ #define CRASHPAD_CLIENT_PRUNE_CRASH_REPORTS_H_ -#include <time.h> +#include <stddef.h> #include <sys/types.h> +#include <time.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crash_report_database.h"
diff --git a/third_party/crashpad/crashpad/client/prune_crash_reports_test.cc b/third_party/crashpad/crashpad/client/prune_crash_reports_test.cc index bb9ea8e..e72c59b 100644 --- a/third_party/crashpad/crashpad/client/prune_crash_reports_test.cc +++ b/third_party/crashpad/crashpad/client/prune_crash_reports_test.cc
@@ -14,12 +14,14 @@ #include "client/prune_crash_reports.h" +#include <stddef.h> #include <stdlib.h> #include <algorithm> #include <string> #include <vector> +#include "base/macros.h" #include "base/rand_util.h" #include "gmock/gmock.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/client/settings.cc b/third_party/crashpad/crashpad/client/settings.cc index b991a38..d018e37f 100644 --- a/third_party/crashpad/crashpad/client/settings.cc +++ b/third_party/crashpad/crashpad/client/settings.cc
@@ -14,6 +14,8 @@ #include "client/settings.h" +#include <stdint.h> + #include <limits> #include "base/logging.h"
diff --git a/third_party/crashpad/crashpad/client/settings.h b/third_party/crashpad/crashpad/client/settings.h index 016f8d84..b64f74f 100644 --- a/third_party/crashpad/crashpad/client/settings.h +++ b/third_party/crashpad/crashpad/client/settings.h
@@ -19,8 +19,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "util/file/file_io.h" #include "util/misc/initialization_state.h"
diff --git a/third_party/crashpad/crashpad/client/settings_test.cc b/third_party/crashpad/crashpad/client/settings_test.cc index 203bd21..ec1009e 100644 --- a/third_party/crashpad/crashpad/client/settings_test.cc +++ b/third_party/crashpad/crashpad/client/settings_test.cc
@@ -14,6 +14,8 @@ #include "client/settings.h" +#include "base/macros.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/scoped_temp_dir.h"
diff --git a/third_party/crashpad/crashpad/client/simple_string_dictionary.h b/third_party/crashpad/crashpad/client/simple_string_dictionary.h index edaca6f..f8cdd4a5 100644 --- a/third_party/crashpad/crashpad/client/simple_string_dictionary.h +++ b/third_party/crashpad/crashpad/client/simple_string_dictionary.h
@@ -15,10 +15,11 @@ #ifndef CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ #define CRASHPAD_CLIENT_SIMPLE_STRING_DICTIONARY_H_ +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "util/misc/implicit_cast.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc b/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc index 6396c2fe..c002fe3 100644 --- a/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc +++ b/third_party/crashpad/crashpad/client/simple_string_dictionary_test.cc
@@ -14,6 +14,9 @@ #include "client/simple_string_dictionary.h" +#include <stddef.h> +#include <string.h> + #include "base/logging.h" #include "gtest/gtest.h" #include "test/gtest_death_check.h"
diff --git a/third_party/crashpad/crashpad/client/simulate_crash_mac.cc b/third_party/crashpad/crashpad/client/simulate_crash_mac.cc index 71d5d90..8e1deb5 100644 --- a/third_party/crashpad/crashpad/client/simulate_crash_mac.cc +++ b/third_party/crashpad/crashpad/client/simulate_crash_mac.cc
@@ -14,12 +14,13 @@ #include "client/simulate_crash_mac.h" +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "util/mach/exc_client_variants.h"
diff --git a/third_party/crashpad/crashpad/client/simulate_crash_mac_test.cc b/third_party/crashpad/crashpad/client/simulate_crash_mac_test.cc index 8953114..320a65e 100644 --- a/third_party/crashpad/crashpad/client/simulate_crash_mac_test.cc +++ b/third_party/crashpad/crashpad/client/simulate_crash_mac_test.cc
@@ -15,9 +15,10 @@ #include "client/simulate_crash.h" #include <mach/mach.h> +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/compat/non_win/winnt.h b/third_party/crashpad/crashpad/compat/non_win/winnt.h index 03167aa..82af0e6d 100644 --- a/third_party/crashpad/crashpad/compat/non_win/winnt.h +++ b/third_party/crashpad/crashpad/compat/non_win/winnt.h
@@ -15,6 +15,8 @@ #ifndef CRASHPAD_COMPAT_NON_WIN_WINNT_H_ #define CRASHPAD_COMPAT_NON_WIN_WINNT_H_ +#include <stdint.h> + //! \file //! \anchor VER_SUITE_x
diff --git a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc index 7d29aa1..c3c4f36 100644 --- a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc +++ b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.cc
@@ -21,6 +21,7 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.h b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.h index 0372a83a..f1bb75b6 100644 --- a/third_party/crashpad/crashpad/handler/crash_report_upload_thread.h +++ b/third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -15,8 +15,6 @@ #ifndef CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ #define CRASHPAD_HANDLER_CRASH_REPORT_UPLOAD_THREAD_H_ -#include "base/basictypes.h" - #include <string> #include "base/memory/scoped_ptr.h"
diff --git a/third_party/crashpad/crashpad/handler/handler_main.cc b/third_party/crashpad/crashpad/handler/handler_main.cc index 7ad13f6..16b89d01 100644 --- a/third_party/crashpad/crashpad/handler/handler_main.cc +++ b/third_party/crashpad/crashpad/handler/handler_main.cc
@@ -15,6 +15,7 @@ #include "handler/handler_main.h" #include <getopt.h> +#include <stdint.h> #include <stdlib.h> #include <map> @@ -31,8 +32,8 @@ #include "build/build_config.h" #include "client/crash_report_database.h" #include "client/crashpad_client.h" -#include "tools/tool_support.h" #include "handler/crash_report_upload_thread.h" +#include "tools/tool_support.h" #include "util/file/file_io.h" #include "util/stdlib/map_insert.h" #include "util/stdlib/string_number_conversion.h"
diff --git a/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.h b/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.h index a09c6b8..63d9bef 100644 --- a/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.h +++ b/third_party/crashpad/crashpad/handler/mac/crash_report_exception_handler.h
@@ -20,7 +20,7 @@ #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "client/crash_report_database.h" #include "handler/crash_report_upload_thread.h" #include "util/mach/exc_server_variants.h"
diff --git a/third_party/crashpad/crashpad/handler/mac/exception_handler_server.cc b/third_party/crashpad/crashpad/handler/mac/exception_handler_server.cc index 38a016e..1a141ba 100644 --- a/third_party/crashpad/crashpad/handler/mac/exception_handler_server.cc +++ b/third_party/crashpad/crashpad/handler/mac/exception_handler_server.cc
@@ -18,6 +18,7 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" +#include "base/macros.h" #include "util/mach/composite_mach_message_server.h" #include "util/mach/mach_extensions.h" #include "util/mach/mach_message.h"
diff --git a/third_party/crashpad/crashpad/handler/mac/exception_handler_server.h b/third_party/crashpad/crashpad/handler/mac/exception_handler_server.h index 421038e..7d893002 100644 --- a/third_party/crashpad/crashpad/handler/mac/exception_handler_server.h +++ b/third_party/crashpad/crashpad/handler/mac/exception_handler_server.h
@@ -15,11 +15,10 @@ #ifndef CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ #define CRASHPAD_HANDLER_MAC_EXCEPTION_HANDLER_SERVER_H_ -#include "base/basictypes.h" - #include <mach/mach.h> #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "util/mach/exc_server_variants.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/handler/win/crash_report_exception_handler.h b/third_party/crashpad/crashpad/handler/win/crash_report_exception_handler.h index f03da16..11b440c4 100644 --- a/third_party/crashpad/crashpad/handler/win/crash_report_exception_handler.h +++ b/third_party/crashpad/crashpad/handler/win/crash_report_exception_handler.h
@@ -20,6 +20,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "util/win/exception_handler_server.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/handler/win/crashy_test_program.cc b/third_party/crashpad/crashpad/handler/win/crashy_test_program.cc index 847093a..dd3c2b4 100644 --- a/third_party/crashpad/crashpad/handler/win/crashy_test_program.cc +++ b/third_party/crashpad/crashpad/handler/win/crashy_test_program.cc
@@ -12,13 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <stddef.h> #include <stdint.h> #include <stdlib.h> #include <windows.h> #include <winternl.h> -#include <string> #include <map> +#include <string> #include <vector> // ntstatus.h conflicts with windows.h so define this locally. @@ -26,9 +27,9 @@ #define STATUS_NO_SUCH_FILE static_cast<NTSTATUS>(0xC000000F) #endif -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "client/crashpad_client.h" #include "util/win/critical_section_with_debug_info.h" #include "util/win/get_function.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc index fef1af31..4df8a65d 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.cc
@@ -14,10 +14,12 @@ #include "minidump/minidump_context_writer.h" +#include <stdint.h> #include <string.h> #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "snapshot/cpu_context.h" #include "util/file/file_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h index e48650e3..d185371 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_context_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_context_writer.h
@@ -15,9 +15,10 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_CONTEXT_WRITER_H_ +#include <stddef.h> #include <sys/types.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_context.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h index 99945da..23d5b0c 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer.h
@@ -15,9 +15,11 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_CRASHPAD_INFO_WRITER_H_ +#include <stddef.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc index d5ff65ce..105e7fb 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
@@ -16,6 +16,7 @@ #include <windows.h> #include <dbghelp.h> +#include <stdint.h> #include <map> #include <string>
diff --git a/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc index cd471b9c..1b94741f 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_exception_writer.cc
@@ -19,6 +19,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "minidump/minidump_context_writer.h" #include "snapshot/exception_snapshot.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_exception_writer.h b/third_party/crashpad/crashpad/minidump/minidump_exception_writer.h index b4de21a..07d1345 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_exception_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_exception_writer.h
@@ -17,11 +17,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_thread_id_map.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc index bc3bfec9..dd43a89 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_exception_writer_test.cc
@@ -16,6 +16,7 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h> @@ -23,6 +24,7 @@ #include <utility> #include <vector> +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_context.h" #include "minidump/minidump_context_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_file_writer.h b/third_party/crashpad/crashpad/minidump/minidump_file_writer.h index 8b738b6..bdb47d8 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_file_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_file_writer.h
@@ -17,12 +17,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <sys/types.h> #include <set> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_file_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_file_writer_test.cc index 314c758..f2e4679 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_file_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_file_writer_test.cc
@@ -16,12 +16,15 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> +#include <stdint.h> +#include <string.h> #include <string> #include <utility> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_handle_writer.h b/third_party/crashpad/crashpad/minidump/minidump_handle_writer.h index 43bdac6..5bd1135 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_handle_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_handle_writer.h
@@ -17,11 +17,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <map> #include <string> #include <vector> +#include "base/macros.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_string_writer.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_handle_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_handle_writer_test.cc index 2a5445d..4dc1e3d 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_handle_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_handle_writer_test.cc
@@ -14,6 +14,8 @@ #include "minidump/minidump_handle_writer.h" +#include <stddef.h> + #include <string> #include <utility>
diff --git a/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.h b/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.h index 6f6ea59..f05f042 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer.h
@@ -17,11 +17,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc index f59cbb8..6dc6e5a 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_memory_info_writer_test.cc
@@ -14,6 +14,8 @@ #include "minidump/minidump_memory_info_writer.h" +#include <stddef.h> + #include <string> #include <utility>
diff --git a/third_party/crashpad/crashpad/minidump/minidump_memory_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_memory_writer.cc index 3528655..4a5f87a 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_memory_writer.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_memory_writer.cc
@@ -18,6 +18,7 @@ #include "base/auto_reset.h" #include "base/logging.h" +#include "base/macros.h" #include "snapshot/memory_snapshot.h" #include "util/file/file_writer.h" #include "util/numeric/safe_assignment.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_memory_writer.h b/third_party/crashpad/crashpad/minidump/minidump_memory_writer.h index 6b5f2df..57aaeaf 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_memory_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_memory_writer.h
@@ -17,12 +17,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_memory_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_memory_writer_test.cc index cefe7475..ea1442b 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_memory_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_memory_writer_test.cc
@@ -16,12 +16,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <utility> -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc index 4d3b143..1cb50be 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
@@ -17,6 +17,7 @@ #include <limits> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.h b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.h index b7c3549..66997cb 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.h
@@ -17,13 +17,14 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <time.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc index de8cde3..f838ba57 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_misc_info_writer_test.cc
@@ -16,13 +16,15 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <string> #include <utility> -#include "base/basictypes.h" #include "base/compiler_specific.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h b/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h index 601da7ee7..f7ef387 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer.h
@@ -15,12 +15,13 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_MODULE_CRASHPAD_INFO_WRITER_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_string_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc index 07f44c1..701e761 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_module_crashpad_info_writer_test.cc
@@ -16,9 +16,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> +#include <stdint.h> #include <utility> +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_simple_string_dictionary_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_module_writer.h b/third_party/crashpad/crashpad/minidump/minidump_module_writer.h index ecf3cb85..c476a92f 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_module_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_module_writer.h
@@ -17,13 +17,14 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <time.h> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "minidump/minidump_extensions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_module_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_module_writer_test.cc index 8d6272d..0d3f05d 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_module_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_module_writer_test.cc
@@ -16,6 +16,7 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <string.h> #include <sys/types.h> @@ -23,6 +24,7 @@ #include <utility> #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer.h b/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer.h index 42bb1b5..6444db0 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer.h
@@ -15,12 +15,13 @@ #ifndef CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_ #define CRASHPAD_MINIDUMP_RVA_LIST_WRITER_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc index fa18dc5..4963f298 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_rva_list_writer_test.cc
@@ -14,9 +14,13 @@ #include "minidump/minidump_rva_list_writer.h" +#include <stddef.h> +#include <stdint.h> + #include <utility> #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "minidump/test/minidump_rva_list_test_util.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h b/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h index 88059bd..d24dc9b 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer.h
@@ -15,13 +15,14 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_SIMPLE_STRING_DICTIONARY_WRITER_H_ +#include <stddef.h> #include <sys/types.h> -#include <string> #include <map> +#include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_string_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc index 1e401d4..bd02ed4 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_simple_string_dictionary_writer_test.cc
@@ -14,6 +14,9 @@ #include "minidump/minidump_simple_string_dictionary_writer.h" +#include <stddef.h> +#include <stdint.h> + #include <map> #include <string> #include <utility>
diff --git a/third_party/crashpad/crashpad/minidump/minidump_stream_writer.h b/third_party/crashpad/crashpad/minidump/minidump_stream_writer.h index c812f5f..894889ae8 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_stream_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_stream_writer.h
@@ -18,7 +18,7 @@ #include <windows.h> #include <dbghelp.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_string_writer.h b/third_party/crashpad/crashpad/minidump/minidump_string_writer.h index ec57179..ff2572d 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_string_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_string_writer.h
@@ -17,11 +17,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string16.h" #include "minidump/minidump_extensions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_string_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_string_writer_test.cc index aa8e48c6..454e362 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_string_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_string_writer_test.cc
@@ -16,13 +16,14 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <sys/types.h> #include <string> -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc index 88687234..102fdcf 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.cc
@@ -14,10 +14,12 @@ #include "minidump/minidump_system_info_writer.h" +#include <stdint.h> #include <string.h> #include <sys/types.h> #include "base/logging.h" +#include "base/macros.h" #include "minidump/minidump_string_writer.h" #include "snapshot/system_snapshot.h" #include "util/file/file_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.h b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.h index a1653dc..2227df5 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer.h
@@ -17,12 +17,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_stream_writer.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc index 88bb0e0..bcecef0 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_system_info_writer_test.cc
@@ -16,6 +16,8 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <sys/types.h>
diff --git a/third_party/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc b/third_party/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc index 058709e..3213342 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_thread_id_map_test.cc
@@ -14,9 +14,12 @@ #include "minidump/minidump_thread_id_map.h" +#include <stddef.h> +#include <stdint.h> + #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "snapshot/test/test_thread_snapshot.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_thread_writer.h b/third_party/crashpad/crashpad/minidump/minidump_thread_writer.h index f8b7d20..604f6440 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_thread_writer.h +++ b/third_party/crashpad/crashpad/minidump/minidump_thread_writer.h
@@ -17,11 +17,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "minidump/minidump_stream_writer.h" #include "minidump/minidump_thread_id_map.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_thread_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_thread_writer_test.cc index ab0561a..89df530 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_thread_writer_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_thread_writer_test.cc
@@ -16,6 +16,8 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> +#include <stdint.h> #include <sys/types.h> #include <string> @@ -23,15 +25,16 @@ #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "minidump/minidump_context_writer.h" -#include "minidump/minidump_memory_writer.h" #include "minidump/minidump_file_writer.h" +#include "minidump/minidump_memory_writer.h" #include "minidump/minidump_thread_id_map.h" #include "minidump/test/minidump_context_test_util.h" -#include "minidump/test/minidump_memory_writer_test_util.h" #include "minidump/test/minidump_file_writer_test_util.h" +#include "minidump/test/minidump_memory_writer_test_util.h" #include "minidump/test/minidump_writable_test_util.h" #include "snapshot/test/test_cpu_context.h" #include "snapshot/test/test_memory_snapshot.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_writable.cc b/third_party/crashpad/crashpad/minidump/minidump_writable.cc index 8b73906..190984ee 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_writable.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_writable.cc
@@ -19,6 +19,7 @@ #include <limits> #include "base/logging.h" +#include "base/macros.h" #include "util/file/file_writer.h" #include "util/numeric/safe_assignment.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_writable.h b/third_party/crashpad/crashpad/minidump/minidump_writable.h index 9e7cf71d..8ca9db2d 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_writable.h +++ b/third_party/crashpad/crashpad/minidump/minidump_writable.h
@@ -17,11 +17,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <sys/types.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/file/file_io.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/minidump/minidump_writable_test.cc b/third_party/crashpad/crashpad/minidump/minidump_writable_test.cc index 38d97de3..77b8000 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_writable_test.cc +++ b/third_party/crashpad/crashpad/minidump/minidump_writable_test.cc
@@ -14,10 +14,12 @@ #include "minidump/minidump_writable.h" +#include <stddef.h> + #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/file/string_file.h"
diff --git a/third_party/crashpad/crashpad/minidump/minidump_writer_util.h b/third_party/crashpad/crashpad/minidump/minidump_writer_util.h index 3b2ab5e7b..afd28f62 100644 --- a/third_party/crashpad/crashpad/minidump/minidump_writer_util.h +++ b/third_party/crashpad/crashpad/minidump/minidump_writer_util.h
@@ -15,13 +15,14 @@ #ifndef CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_ #define CRASHPAD_MINIDUMP_MINIDUMP_WRITER_UTIL_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <time.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string16.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc b/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc index a0e0640..639fdc97 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc +++ b/third_party/crashpad/crashpad/minidump/test/minidump_context_test_util.cc
@@ -14,8 +14,11 @@ #include "minidump/test/minidump_context_test_util.h" -#include "base/basictypes.h" +#include <stddef.h> +#include <string.h> + #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "snapshot/cpu_context.h"
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h b/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h index f4b97675..c020e97 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h +++ b/third_party/crashpad/crashpad/minidump/test/minidump_memory_writer_test_util.h
@@ -19,11 +19,12 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/file/file_writer.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc b/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc index ebaa8f07..2ba5d024 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc +++ b/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.cc
@@ -16,6 +16,7 @@ #include <windows.h> #include <dbghelp.h> +#include <stdint.h> #include "minidump/minidump_extensions.h" #include "minidump/test/minidump_writable_test_util.h"
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h b/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h index 4865d01..5ee9a33 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h +++ b/third_party/crashpad/crashpad/minidump/test/minidump_rva_list_test_util.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_MINIDUMP_TEST_MINIDUMP_RVA_LIST_TEST_UTIL_H_ #define CRASHPAD_MINIDUMP_TEST_MINIDUMP_RVA_LIST_TEST_UTIL_H_ +#include <stddef.h> #include <sys/types.h> #include <string>
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc b/third_party/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc index 6f5ff6b..c0e7ffa 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc +++ b/third_party/crashpad/crashpad/minidump/test/minidump_string_writer_test_util.cc
@@ -14,6 +14,8 @@ #include "minidump/test/minidump_string_writer_test_util.h" +#include <stddef.h> + #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/test/minidump_writable_test_util.h"
diff --git a/third_party/crashpad/crashpad/minidump/test/minidump_writable_test_util.h b/third_party/crashpad/crashpad/minidump/test/minidump_writable_test_util.h index f619028..ae3172c 100644 --- a/third_party/crashpad/crashpad/minidump/test/minidump_writable_test_util.h +++ b/third_party/crashpad/crashpad/minidump/test/minidump_writable_test_util.h
@@ -17,12 +17,13 @@ #include <windows.h> #include <dbghelp.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "minidump/minidump_extensions.h" #include "minidump/minidump_writable.h"
diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context.cc b/third_party/crashpad/crashpad/snapshot/cpu_context.cc index 1ff2b459..c11a031 100644 --- a/third_party/crashpad/crashpad/snapshot/cpu_context.cc +++ b/third_party/crashpad/crashpad/snapshot/cpu_context.cc
@@ -14,7 +14,6 @@ #include "snapshot/cpu_context.h" -#include "base/basictypes.h" #include "base/logging.h" #include "util/misc/implicit_cast.h"
diff --git a/third_party/crashpad/crashpad/snapshot/cpu_context_test.cc b/third_party/crashpad/crashpad/snapshot/cpu_context_test.cc index a5f0b6aa..27134f9 100644 --- a/third_party/crashpad/crashpad/snapshot/cpu_context_test.cc +++ b/third_party/crashpad/crashpad/snapshot/cpu_context_test.cc
@@ -14,10 +14,11 @@ #include "snapshot/cpu_context.h" +#include <stddef.h> #include <stdint.h> #include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options.h b/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options.h index 2d6c35e..3f9e03da 100644 --- a/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options.h +++ b/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options.h
@@ -15,6 +15,8 @@ #ifndef CRASHPAD_SNAPSHOT_CRASHPAD_INFO_CLIENT_OPTIONS_H_ #define CRASHPAD_SNAPSHOT_CRASHPAD_INFO_CLIENT_OPTIONS_H_ +#include <stdint.h> + #include "util/misc/tri_state.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc b/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc index d57f1c149..9c1f88b5 100644 --- a/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc +++ b/third_party/crashpad/crashpad/snapshot/crashpad_info_client_options_test.cc
@@ -15,6 +15,7 @@ #include "snapshot/crashpad_info_client_options.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "client/crashpad_info.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc b/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc index 8dca246..8b08a0a 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac.cc
@@ -17,6 +17,7 @@ #include <string.h> #include "base/logging.h" +#include "build/build_config.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc b/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc index 844c9f6..541056a 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/cpu_context_mac_test.cc
@@ -16,6 +16,7 @@ #include <mach/mach.h> +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc b/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc index b5725d38e..bd8ecce 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.cc
@@ -16,6 +16,7 @@ #include "base/logging.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "snapshot/mac/cpu_context_mac.h" #include "snapshot/mac/process_reader.h" #include "util/mach/exception_behaviors.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h index ea1161c..325d9516 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/exception_snapshot_mac.h
@@ -20,7 +20,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc index 1e2b740..23caf87 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.cc
@@ -16,6 +16,7 @@ #include <mach-o/loader.h> #include <mach/mach.h> +#include <stddef.h> #include <utility>
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h index f8fb1ec..2ff6e0e 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader.h
@@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_types.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc index 32f3b5c..4949fba 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_annotations_reader_test.cc
@@ -17,6 +17,7 @@ #include <dlfcn.h> #include <mach/mach.h> #include <signal.h> +#include <stddef.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -25,8 +26,8 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "client/crashpad_info.h" #include "client/simple_string_dictionary.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc index 09b7ffe..f98a658 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.cc
@@ -19,10 +19,11 @@ #include <string.h> #include <limits> -#include <vector> #include <utility> +#include <vector> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "client/crashpad_info.h" #include "snapshot/mac/mach_o_image_segment_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h index 7047bc6..7539fde 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
@@ -16,12 +16,13 @@ #define CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_READER_H_ #include <mach/mach.h> +#include <stddef.h> #include <stdint.h> #include <map> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/mac/process_types.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc index b2e5fed..071e726 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader_test.cc
@@ -22,6 +22,7 @@ #include <mach-o/ldsyms.h> #include <mach-o/loader.h> #include <mach-o/nlist.h> +#include <stddef.h> #include <stdint.h> #include "base/strings/stringprintf.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h index 4e6a97e..06f9207e 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader.h
@@ -16,6 +16,7 @@ #define CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_SEGMENT_READER_H_ #include <mach/mach.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h> @@ -23,7 +24,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_types.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc index bf375af..8c99917 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_segment_reader_test.cc
@@ -15,8 +15,9 @@ #include "snapshot/mac/mach_o_image_segment_reader.h" #include <mach-o/loader.h> +#include <stddef.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc index 949e460..4cf4ef1 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.cc
@@ -16,9 +16,11 @@ #include <mach-o/loader.h> #include <mach-o/nlist.h> +#include <stddef.h> #include <utility> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" #include "util/mac/checked_mach_address_range.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h index 9302e7f..a9867b0 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_symbol_table_reader.h
@@ -15,14 +15,13 @@ #ifndef CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_SYMBOL_TABLE_READER_H_ #define CRASHPAD_SNAPSHOT_MAC_MACH_O_IMAGE_SYMBOL_TABLE_READER_H_ -#include "base/basictypes.h" - #include <map> #include <string> #include <mach/mach.h> #include <stdint.h> +#include "base/macros.h" #include "snapshot/mac/mach_o_image_segment_reader.h" #include "snapshot/mac/process_reader.h" #include "snapshot/mac/process_types.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/memory_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/memory_snapshot_mac.h index 2f19082..9951dee2 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/memory_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/memory_snapshot_mac.h
@@ -15,10 +15,11 @@ #ifndef CRASHPAD_SNAPSHOT_MAC_MEMORY_SNAPSHOT_MAC_H_ #define CRASHPAD_SNAPSHOT_MAC_MEMORY_SNAPSHOT_MAC_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/mac/process_reader.h" #include "snapshot/memory_snapshot.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h index 42b1470..b1a232f 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/module_snapshot_mac.h
@@ -22,7 +22,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h" #include "snapshot/mac/process_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_reader.cc b/third_party/crashpad/crashpad/snapshot/mac/process_reader.cc index c7f674b..92b9d05 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/process_reader.cc
@@ -25,6 +25,7 @@ #include "base/mac/scoped_mach_port.h" #include "base/mac/scoped_mach_vm.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "snapshot/mac/mach_o_image_reader.h" #include "snapshot/mac/process_types.h" #include "util/misc/scoped_forbid_return.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_reader.h b/third_party/crashpad/crashpad/snapshot/mac/process_reader.h index a781667..5204e4c 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_reader.h +++ b/third_party/crashpad/crashpad/snapshot/mac/process_reader.h
@@ -16,6 +16,8 @@ #define CRASHPAD_SNAPSHOT_MAC_PROCESS_READER_H_ #include <mach/mach.h> +#include <stddef.h> +#include <stdint.h> #include <sys/time.h> #include <sys/types.h> #include <time.h> @@ -23,7 +25,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "build/build_config.h" #include "util/mach/task_memory.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_reader_test.cc b/third_party/crashpad/crashpad/snapshot/mac/process_reader_test.cc index 2cbf8ea..0c4778f 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_reader_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/process_reader_test.cc
@@ -19,6 +19,8 @@ #include <mach-o/dyld_images.h> #include <mach/mach.h> #include <OpenCL/opencl.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <sys/stat.h> @@ -28,6 +30,7 @@ #include "base/logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/strings/stringprintf.h" #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h index dd5b9c3a..92c7376 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/process_snapshot_mac.h
@@ -23,7 +23,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_types.cc b/third_party/crashpad/crashpad/snapshot/mac/process_types.cc index 0fc14f0..dd10549 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_types.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/process_types.cc
@@ -17,6 +17,7 @@ #include <string.h> #include <uuid/uuid.h> +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/mac/process_types/internal.h" #include "util/mach/task_memory.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_types.h b/third_party/crashpad/crashpad/snapshot/mac/process_types.h index a1039dd..44e3385 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_types.h +++ b/third_party/crashpad/crashpad/snapshot/mac/process_types.h
@@ -18,6 +18,7 @@ #include <mach/mach.h> #include <mach-o/dyld_images.h> #include <mach-o/loader.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h>
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_types/custom.cc b/third_party/crashpad/crashpad/snapshot/mac/process_types/custom.cc index 6d6fd0db..606743a 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_types/custom.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/process_types/custom.cc
@@ -14,6 +14,7 @@ #include "snapshot/mac/process_types.h" +#include <stddef.h> #include <string.h> #include "base/logging.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/process_types_test.cc b/third_party/crashpad/crashpad/snapshot/mac/process_types_test.cc index 7252c5c..3545576 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/process_types_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/process_types_test.cc
@@ -16,12 +16,15 @@ #include <AvailabilityMacros.h> #include <mach/mach.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/mac/dyld.h" #include "util/mac/mac_util.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc index 185372d..7eddeb03 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.cc
@@ -14,12 +14,15 @@ #include "snapshot/mac/system_snapshot_mac.h" +#include <stddef.h> +#include <stdint.h> #include <sys/sysctl.h> #include <sys/types.h> #include <sys/utsname.h> #include <time.h> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "snapshot/cpu_context.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h index edbd74f..0f18a48 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac.h
@@ -19,7 +19,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc index a02e94e0..bc10a948 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/system_snapshot_mac_test.cc
@@ -19,6 +19,7 @@ #include <string> +#include "base/macros.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/mac/process_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc b/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc index b042f75..03c3a24 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc +++ b/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.cc
@@ -15,6 +15,7 @@ #include "snapshot/mac/thread_snapshot_mac.h" #include "base/logging.h" +#include "build/build_config.h" #include "snapshot/mac/cpu_context_mac.h" #include "snapshot/mac/process_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h b/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h index 35b77bba..bbb7f77 100644 --- a/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h +++ b/third_party/crashpad/crashpad/snapshot/mac/thread_snapshot_mac.h
@@ -18,7 +18,7 @@ #include <mach/mach.h> #include <stdint.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/mac/memory_snapshot_mac.h"
diff --git a/third_party/crashpad/crashpad/snapshot/memory_snapshot.h b/third_party/crashpad/crashpad/snapshot/memory_snapshot.h index 47f8443..b027522 100644 --- a/third_party/crashpad/crashpad/snapshot/memory_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/memory_snapshot.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_SNAPSHOT_MEMORY_SNAPSHOT_H_ #define CRASHPAD_SNAPSHOT_MEMORY_SNAPSHOT_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h>
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc b/third_party/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc index 0d8301c1..7e263f9 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/minidump/minidump_simple_string_dictionary_reader.cc
@@ -14,8 +14,10 @@ #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h" -#include <vector> +#include <stdint.h> + #include <utility> +#include <vector> #include "base/logging.h" #include "minidump/minidump_extensions.h"
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc b/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc index 9ca6ef0..3b9bd6b 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_list_reader.cc
@@ -14,6 +14,8 @@ #include "snapshot/minidump/minidump_string_list_reader.h" +#include <stdint.h> + #include "base/logging.h" #include "minidump/minidump_extensions.h" #include "snapshot/minidump/minidump_string_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc b/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc index 6ea3608..4a5cb13 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/minidump/minidump_string_reader.cc
@@ -14,6 +14,8 @@ #include "snapshot/minidump/minidump_string_reader.h" +#include <stdint.h> + #include "base/logging.h" #include "minidump/minidump_extensions.h"
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h b/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h index bf93366..b9b7d55 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h +++ b/third_party/crashpad/crashpad/snapshot/minidump/module_snapshot_minidump.h
@@ -24,7 +24,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/module_snapshot.h" #include "util/file/file_reader.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h index 9384eaf..ad1af3e8 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h +++ b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.h
@@ -15,19 +15,20 @@ #ifndef CRASHPAD_SNAPSHOT_MINIDUMP_PROCESS_SNAPSHOT_MINIDUMP_H_ #define CRASHPAD_SNAPSHOT_MINIDUMP_PROCESS_SNAPSHOT_MINIDUMP_H_ -#include <sys/time.h> #include <windows.h> #include <dbghelp.h> +#include <stdint.h> +#include <sys/time.h> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "minidump/minidump_extensions.h" #include "snapshot/exception_snapshot.h" -#include "snapshot/minidump/module_snapshot_minidump.h" #include "snapshot/memory_snapshot.h" +#include "snapshot/minidump/module_snapshot_minidump.h" #include "snapshot/module_snapshot.h" #include "snapshot/process_snapshot.h" #include "snapshot/system_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc index 8eb7349..8ab727fe 100644 --- a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc +++ b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump_test.cc
@@ -14,9 +14,10 @@ #include "snapshot/minidump/process_snapshot_minidump.h" -#include <string.h> #include <windows.h> #include <dbghelp.h> +#include <stdint.h> +#include <string.h> #include "base/memory/scoped_ptr.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc b/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc index a66d393..506274ed 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc +++ b/third_party/crashpad/crashpad/snapshot/test/test_cpu_context.cc
@@ -12,9 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "snapshot/test/test_cpu_context.h" +#include <stddef.h> +#include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" +#include "snapshot/test/test_cpu_context.h" namespace crashpad { namespace test {
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_exception_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_exception_snapshot.h index 291f6c1..a17f3dc 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_exception_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_exception_snapshot.h
@@ -19,7 +19,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h index e9edc5c..0a76888 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_memory_map_region_snapshot.h
@@ -17,7 +17,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_map_region_snapshot.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_memory_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_memory_snapshot.h index 31faea4..01d0c5d 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_memory_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_memory_snapshot.h
@@ -15,10 +15,11 @@ #ifndef CRASHPAD_SNAPSHOT_TEST_TEST_MEMORY_SNAPSHOT_H_ #define CRASHPAD_SNAPSHOT_TEST_TEST_MEMORY_SNAPSHOT_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_snapshot.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_module_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_module_snapshot.h index 85a5622e6..ff9bdbd5 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_module_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_module_snapshot.h
@@ -22,7 +22,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/module_snapshot.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h index 6e81354..f771944e 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_process_snapshot.h
@@ -24,7 +24,7 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/exception_snapshot.h" #include "snapshot/memory_map_region_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_system_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_system_snapshot.h index d626fae8..31787eba 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_system_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_system_snapshot.h
@@ -19,7 +19,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/test/test_thread_snapshot.h b/third_party/crashpad/crashpad/snapshot/test/test_thread_snapshot.h index 29e3f5f..1fe1328 100644 --- a/third_party/crashpad/crashpad/snapshot/test/test_thread_snapshot.h +++ b/third_party/crashpad/crashpad/snapshot/test/test_thread_snapshot.h
@@ -20,7 +20,7 @@ #include <utility> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/cpu_context.h" #include "snapshot/memory_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/cpu_context_win.cc b/third_party/crashpad/crashpad/snapshot/win/cpu_context_win.cc index d4ce66d..62a27a0 100644 --- a/third_party/crashpad/crashpad/snapshot/win/cpu_context_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/cpu_context_win.cc
@@ -14,9 +14,11 @@ #include "snapshot/win/cpu_context_win.h" +#include <stdint.h> #include <string.h> #include "base/logging.h" +#include "build/build_config.h" #include "snapshot/cpu_context.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc index 07b1c8e..e3d45c33 100644 --- a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.cc
@@ -14,6 +14,7 @@ #include "snapshot/win/exception_snapshot_win.h" +#include "build/build_config.h" #include "snapshot/win/cpu_context_win.h" #include "snapshot/win/process_reader_win.h" #include "util/win/nt_internals.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.h index 1688b125..63d5bbfe 100644 --- a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win.h
@@ -15,10 +15,10 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_EXCEPTION_SNAPSHOT_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_EXCEPTION_SNAPSHOT_WIN_H_ -#include <stdint.h> #include <windows.h> +#include <stdint.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/exception_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc index 5c3b0609e..617b000 100644 --- a/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc +++ b/third_party/crashpad/crashpad/snapshot/win/exception_snapshot_win_test.cc
@@ -14,11 +14,15 @@ #include "snapshot/win/exception_snapshot_win.h" +#include <stdint.h> + #include <string> #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "client/crashpad_client.h" #include "gtest/gtest.h" #include "snapshot/win/process_snapshot_win.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/memory_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/memory_snapshot_win.h index b6d2074e..374e356cf 100644 --- a/third_party/crashpad/crashpad/snapshot/win/memory_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/memory_snapshot_win.h
@@ -15,10 +15,11 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_MEMORY_SNAPSHOT_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_MEMORY_SNAPSHOT_WIN_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/memory_snapshot.h" #include "snapshot/win/process_reader_win.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/module_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/module_snapshot_win.h index 92e5913..b682be4 100644 --- a/third_party/crashpad/crashpad/snapshot/win/module_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/module_snapshot_win.h
@@ -15,15 +15,15 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_MODULE_SNAPSHOT_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_MODULE_SNAPSHOT_WIN_H_ +#include <windows.h> #include <stdint.h> #include <sys/types.h> -#include <windows.h> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "snapshot/crashpad_info_client_options.h" #include "snapshot/module_snapshot.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc index f2d1454..7698bfd 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.cc
@@ -14,6 +14,7 @@ #include "snapshot/win/pe_image_annotations_reader.h" +#include <stddef.h> #include <string.h> #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h index 3409ac8..868b076c 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader.h
@@ -19,7 +19,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc index a37ac1e..9bdf124 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_annotations_reader_test.cc
@@ -21,9 +21,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "client/crashpad_info.h" #include "client/simple_string_dictionary.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.cc b/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.cc index 4ae745fc..4effaad7 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.cc +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.cc
@@ -17,6 +17,7 @@ #include <string.h> #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crashpad_info.h" #include "snapshot/win/pe_image_resource_reader.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.h b/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.h index 87e3a8f4..c576774f 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.h +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_reader.h
@@ -16,10 +16,12 @@ #define CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_READER_H_ #include <windows.h> +#include <stddef.h> +#include <stdint.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/win/process_subrange_reader.h" #include "util/misc/initialization_state_dcheck.h" #include "util/misc/uuid.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h b/third_party/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h index 59a6d95..ce339dd 100644 --- a/third_party/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h +++ b/third_party/crashpad/crashpad/snapshot/win/pe_image_resource_reader.h
@@ -15,12 +15,12 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_RESOURCE_READER_H_ #define CRASHPAD_SNAPSHOT_WIN_PE_IMAGE_RESOURCE_READER_H_ -#include <stdint.h> #include <windows.h> +#include <stdint.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/win/process_subrange_reader.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_reader_win.cc b/third_party/crashpad/crashpad/snapshot/win/process_reader_win.cc index f3b6323..7303dd8 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_reader_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_reader_win.cc
@@ -14,11 +14,13 @@ #include "snapshot/win/process_reader_win.h" +#include <string.h> #include <winternl.h> #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "util/win/capture_context.h" #include "util/win/nt_internals.h" #include "util/win/ntstatus_logging.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_reader_win.h b/third_party/crashpad/crashpad/snapshot/win/process_reader_win.h index 90a115d..7e6d70c5 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_reader_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/process_reader_win.h
@@ -15,11 +15,13 @@ #ifndef CRASHPAD_SNAPSHOT_WIN_PROCESS_READER_WIN_H_ #define CRASHPAD_SNAPSHOT_WIN_PROCESS_READER_WIN_H_ -#include <sys/time.h> #include <windows.h> +#include <stdint.h> +#include <sys/time.h> #include <vector> +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_reader_win_test.cc b/third_party/crashpad/crashpad/snapshot/win/process_reader_win_test.cc index 2c4660e..d1609e8 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_reader_win_test.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_reader_win_test.cc
@@ -14,9 +14,11 @@ #include "snapshot/win/process_reader_win.h" -#include <string.h> #include <windows.h> +#include <string.h> +#include "base/macros.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/win/win_multiprocess.h" #include "util/synchronization/semaphore.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc index 8c184c2..b781b303 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.cc
@@ -17,6 +17,7 @@ #include <algorithm> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "snapshot/win/memory_snapshot_win.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.h index a1dd723..6a389ce 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win.h
@@ -16,13 +16,14 @@ #define CRASHPAD_SNAPSHOT_WIN_PROCESS_SNAPSHOT_WIN_H_ #include <windows.h> +#include <stddef.h> #include <sys/time.h> #include <map> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "client/crashpad_info.h" #include "snapshot/crashpad_info_client_options.h" @@ -41,9 +42,9 @@ #include "snapshot/win/thread_snapshot_win.h" #include "util/misc/initialization_state_dcheck.h" #include "util/misc/uuid.h" +#include "util/stdlib/pointer_container.h" #include "util/win/address_types.h" #include "util/win/process_structs.h" -#include "util/stdlib/pointer_container.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc index 0c4c343..dc253bd24 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc +++ b/third_party/crashpad/crashpad/snapshot/win/process_snapshot_win_test.cc
@@ -15,15 +15,16 @@ #include "snapshot/win/process_snapshot_win.h" #include "base/files/file_path.h" +#include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/win/module_snapshot_win.h" #include "snapshot/win/pe_image_reader.h" #include "snapshot/win/process_reader_win.h" +#include "test/paths.h" +#include "test/win/child_launcher.h" #include "util/file/file_io.h" #include "util/win/scoped_handle.h" #include "util/win/scoped_process_suspend.h" -#include "test/paths.h" -#include "test/win/child_launcher.h" namespace crashpad { namespace test {
diff --git a/third_party/crashpad/crashpad/snapshot/win/process_subrange_reader.h b/third_party/crashpad/crashpad/snapshot/win/process_subrange_reader.h index e8da592c..f6af00ed 100644 --- a/third_party/crashpad/crashpad/snapshot/win/process_subrange_reader.h +++ b/third_party/crashpad/crashpad/snapshot/win/process_subrange_reader.h
@@ -17,7 +17,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/misc/initialization_state_dcheck.h" #include "util/win/address_types.h" #include "util/win/checked_win_address_range.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc index a62bf5a..b3458246 100644 --- a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.cc
@@ -14,9 +14,10 @@ #include "snapshot/win/system_snapshot_win.h" +#include <windows.h> #include <intrin.h> #include <powrprof.h> -#include <windows.h> +#include <stdint.h> #include <winnt.h> #include <algorithm>
diff --git a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.h index b7a22c6ad..fc209a5f 100644 --- a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win.h
@@ -20,7 +20,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "snapshot/system_snapshot.h" #include "snapshot/win/process_reader_win.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc index d0caee7..d02195c 100644 --- a/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc +++ b/third_party/crashpad/crashpad/snapshot/win/system_snapshot_win_test.cc
@@ -19,6 +19,7 @@ #include <string> +#include "base/macros.h" #include "build/build_config.h" #include "gtest/gtest.h" #include "snapshot/win/process_reader_win.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc b/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc index 9c8c9ea..2239298 100644 --- a/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc +++ b/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.cc
@@ -17,6 +17,7 @@ #include <vector> #include "base/logging.h" +#include "build/build_config.h" #include "snapshot/win/cpu_context_win.h" #include "snapshot/win/process_reader_win.h"
diff --git a/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.h b/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.h index 3f283a1..0e07110 100644 --- a/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.h +++ b/third_party/crashpad/crashpad/snapshot/win/thread_snapshot_win.h
@@ -19,7 +19,8 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" +#include "build/build_config.h" #include "snapshot/cpu_context.h" #include "snapshot/memory_snapshot.h" #include "snapshot/thread_snapshot.h"
diff --git a/third_party/crashpad/crashpad/test/file.cc b/third_party/crashpad/crashpad/test/file.cc index 9c00743..cd53b1b 100644 --- a/third_party/crashpad/crashpad/test/file.cc +++ b/third_party/crashpad/crashpad/test/file.cc
@@ -17,6 +17,7 @@ #include <errno.h> #include <sys/stat.h> +#include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h"
diff --git a/third_party/crashpad/crashpad/test/mac/mach_multiprocess.h b/third_party/crashpad/crashpad/test/mac/mach_multiprocess.h index 18324d4..0e3a8c4 100644 --- a/third_party/crashpad/crashpad/test/mac/mach_multiprocess.h +++ b/third_party/crashpad/crashpad/test/mac/mach_multiprocess.h
@@ -18,7 +18,7 @@ #include <mach/mach.h> #include <unistd.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "test/multiprocess.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/test/mac/mach_multiprocess_test.cc b/third_party/crashpad/crashpad/test/mac/mach_multiprocess_test.cc index 858821f..ef39559 100644 --- a/third_party/crashpad/crashpad/test/mac/mach_multiprocess_test.cc +++ b/third_party/crashpad/crashpad/test/mac/mach_multiprocess_test.cc
@@ -16,7 +16,7 @@ #include <unistd.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/test/multiprocess.h b/third_party/crashpad/crashpad/test/multiprocess.h index bbfbca31..a7ef689 100644 --- a/third_party/crashpad/crashpad/test/multiprocess.h +++ b/third_party/crashpad/crashpad/test/multiprocess.h
@@ -17,7 +17,7 @@ #include <sys/types.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/file/file_io.h"
diff --git a/third_party/crashpad/crashpad/test/multiprocess_exec.h b/third_party/crashpad/crashpad/test/multiprocess_exec.h index 2d8f338..9b2ffc1 100644 --- a/third_party/crashpad/crashpad/test/multiprocess_exec.h +++ b/third_party/crashpad/crashpad/test/multiprocess_exec.h
@@ -18,7 +18,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "test/multiprocess.h"
diff --git a/third_party/crashpad/crashpad/test/multiprocess_exec_test.cc b/third_party/crashpad/crashpad/test/multiprocess_exec_test.cc index dc916404a..f6231e9c 100644 --- a/third_party/crashpad/crashpad/test/multiprocess_exec_test.cc +++ b/third_party/crashpad/crashpad/test/multiprocess_exec_test.cc
@@ -14,7 +14,7 @@ #include "test/multiprocess_exec.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "build/build_config.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/test/multiprocess_exec_test_child.cc b/third_party/crashpad/crashpad/test/multiprocess_exec_test_child.cc index c796e4a3..84d44ab3 100644 --- a/third_party/crashpad/crashpad/test/multiprocess_exec_test_child.cc +++ b/third_party/crashpad/crashpad/test/multiprocess_exec_test_child.cc
@@ -14,6 +14,7 @@ #include <errno.h> #include <limits.h> +#include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <sys/types.h>
diff --git a/third_party/crashpad/crashpad/test/multiprocess_exec_win.cc b/third_party/crashpad/crashpad/test/multiprocess_exec_win.cc index 2a58f84..1db73795 100644 --- a/third_party/crashpad/crashpad/test/multiprocess_exec_win.cc +++ b/third_party/crashpad/crashpad/test/multiprocess_exec_win.cc
@@ -14,6 +14,8 @@ #include "test/multiprocess_exec.h" +#include <stddef.h> + #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/test/multiprocess_posix_test.cc b/third_party/crashpad/crashpad/test/multiprocess_posix_test.cc index 87a4238..191bdeff 100644 --- a/third_party/crashpad/crashpad/test/multiprocess_posix_test.cc +++ b/third_party/crashpad/crashpad/test/multiprocess_posix_test.cc
@@ -18,7 +18,7 @@ #include <sys/signal.h> #include <unistd.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/gtest_death_check.h" #include "util/file/file_io.h"
diff --git a/third_party/crashpad/crashpad/test/paths.h b/third_party/crashpad/crashpad/test/paths.h index c143169..7643ddd 100644 --- a/third_party/crashpad/crashpad/test/paths.h +++ b/third_party/crashpad/crashpad/test/paths.h
@@ -15,8 +15,8 @@ #ifndef CRASHPAD_TEST_PATHS_H_ #define CRASHPAD_TEST_PATHS_H_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" namespace crashpad { namespace test {
diff --git a/third_party/crashpad/crashpad/test/scoped_temp_dir.h b/third_party/crashpad/crashpad/test/scoped_temp_dir.h index 781975c..5e937e7 100644 --- a/third_party/crashpad/crashpad/test/scoped_temp_dir.h +++ b/third_party/crashpad/crashpad/test/scoped_temp_dir.h
@@ -15,8 +15,8 @@ #ifndef CRASHPAD_TEST_SCOPED_TEMP_DIR_ #define CRASHPAD_TEST_SCOPED_TEMP_DIR_ -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" namespace crashpad { namespace test {
diff --git a/third_party/crashpad/crashpad/test/win/win_child_process.h b/third_party/crashpad/crashpad/test/win/win_child_process.h index 6ca6eca..6b8fed1 100644 --- a/third_party/crashpad/crashpad/test/win/win_child_process.h +++ b/third_party/crashpad/crashpad/test/win/win_child_process.h
@@ -15,7 +15,7 @@ #ifndef CRASHPAD_TEST_WIN_WIN_CHILD_PROCESS_H_ #define CRASHPAD_TEST_WIN_WIN_CHILD_PROCESS_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/file/file_io.h" #include "util/win/scoped_handle.h"
diff --git a/third_party/crashpad/crashpad/test/win/win_child_process_test.cc b/third_party/crashpad/crashpad/test/win/win_child_process_test.cc index e191dcc..7527535 100644 --- a/third_party/crashpad/crashpad/test/win/win_child_process_test.cc +++ b/third_party/crashpad/crashpad/test/win/win_child_process_test.cc
@@ -14,10 +14,10 @@ #include "test/win/win_child_process.h" -#include <stdlib.h> #include <windows.h> +#include <stdlib.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/test/win/win_multiprocess.h b/third_party/crashpad/crashpad/test/win/win_multiprocess.h index 906fa5dd..1e83a58 100644 --- a/third_party/crashpad/crashpad/test/win/win_multiprocess.h +++ b/third_party/crashpad/crashpad/test/win/win_multiprocess.h
@@ -17,7 +17,7 @@ #include <windows.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/win/win_child_process.h" #include "util/file/file_io.h"
diff --git a/third_party/crashpad/crashpad/test/win/win_multiprocess_test.cc b/third_party/crashpad/crashpad/test/win/win_multiprocess_test.cc index 19af08e..e1a315e 100644 --- a/third_party/crashpad/crashpad/test/win/win_multiprocess_test.cc +++ b/third_party/crashpad/crashpad/test/win/win_multiprocess_test.cc
@@ -14,7 +14,7 @@ #include "test/win/win_multiprocess.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/tools/crashpad_database_util.cc b/third_party/crashpad/crashpad/tools/crashpad_database_util.cc index a1ad52b..dcb5496 100644 --- a/third_party/crashpad/crashpad/tools/crashpad_database_util.cc +++ b/third_party/crashpad/crashpad/tools/crashpad_database_util.cc
@@ -14,6 +14,7 @@ #include <errno.h> #include <getopt.h> +#include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -25,9 +26,9 @@ #include <utility> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/numerics/safe_conversions.h" #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/crashpad/crashpad/tools/mac/catch_exception_tool.cc b/third_party/crashpad/crashpad/tools/mac/catch_exception_tool.cc index 32c6aed..e38dab5 100644 --- a/third_party/crashpad/crashpad/tools/mac/catch_exception_tool.cc +++ b/third_party/crashpad/crashpad/tools/mac/catch_exception_tool.cc
@@ -14,6 +14,7 @@ #include <getopt.h> #include <libgen.h> +#include <stddef.h> #include <stdio.h> #include <string.h> #include <unistd.h>
diff --git a/third_party/crashpad/crashpad/tools/mac/exception_port_tool.cc b/third_party/crashpad/crashpad/tools/mac/exception_port_tool.cc index b873e68..11603814 100644 --- a/third_party/crashpad/crashpad/tools/mac/exception_port_tool.cc +++ b/third_party/crashpad/crashpad/tools/mac/exception_port_tool.cc
@@ -16,6 +16,7 @@ #include <getopt.h> #include <libgen.h> #include <mach/mach.h> +#include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -24,9 +25,9 @@ #include <string> #include <vector> -#include "base/basictypes.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "tools/tool_support.h" #include "util/mach/exception_ports.h"
diff --git a/third_party/crashpad/crashpad/tools/tool_support.cc b/third_party/crashpad/crashpad/tools/tool_support.cc index 5d3592bc..401cff3 100644 --- a/third_party/crashpad/crashpad/tools/tool_support.cc +++ b/third_party/crashpad/crashpad/tools/tool_support.cc
@@ -20,6 +20,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" +#include "build/build_config.h" #include "package.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/tools/tool_support.h b/third_party/crashpad/crashpad/tools/tool_support.h index 9099691..79dc752 100644 --- a/third_party/crashpad/crashpad/tools/tool_support.h +++ b/third_party/crashpad/crashpad/tools/tool_support.h
@@ -17,8 +17,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_io.h b/third_party/crashpad/crashpad/util/file/file_io.h index 55909415..ae920db8 100644 --- a/third_party/crashpad/crashpad/util/file/file_io.h +++ b/third_party/crashpad/crashpad/util/file/file_io.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_UTIL_FILE_FILE_IO_H_ #define CRASHPAD_UTIL_FILE_FILE_IO_H_ +#include <stddef.h> #include <sys/types.h> #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_io_posix.cc b/third_party/crashpad/crashpad/util/file/file_io_posix.cc index ce08a39..d6625f8 100644 --- a/third_party/crashpad/crashpad/util/file/file_io_posix.cc +++ b/third_party/crashpad/crashpad/util/file/file_io_posix.cc
@@ -15,6 +15,7 @@ #include "util/file/file_io.h" #include <fcntl.h> +#include <stddef.h> #include <sys/file.h> #include <unistd.h>
diff --git a/third_party/crashpad/crashpad/util/file/file_io_test.cc b/third_party/crashpad/crashpad/util/file/file_io_test.cc index 77529ea5..7dd763c 100644 --- a/third_party/crashpad/crashpad/util/file/file_io_test.cc +++ b/third_party/crashpad/crashpad/util/file/file_io_test.cc
@@ -14,9 +14,11 @@ #include "util/file/file_io.h" +#include <stddef.h> + #include "base/atomicops.h" -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/file.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_io_win.cc b/third_party/crashpad/crashpad/util/file/file_io_win.cc index def2a5a..7f48317 100644 --- a/third_party/crashpad/crashpad/util/file/file_io_win.cc +++ b/third_party/crashpad/crashpad/util/file/file_io_win.cc
@@ -14,6 +14,8 @@ #include "util/file/file_io.h" +#include <stddef.h> + #include "base/files/file_path.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_reader.h b/third_party/crashpad/crashpad/util/file/file_reader.h index 5d77b87..27bd284 100644 --- a/third_party/crashpad/crashpad/util/file/file_reader.h +++ b/third_party/crashpad/crashpad/util/file/file_reader.h
@@ -15,11 +15,12 @@ #ifndef CRASHPAD_UTIL_FILE_FILE_READER_H_ #define CRASHPAD_UTIL_FILE_FILE_READER_H_ +#include <stddef.h> #include <stdio.h> #include <sys/types.h> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" #include "util/file/file_seeker.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_writer.cc b/third_party/crashpad/crashpad/util/file/file_writer.cc index 00a323e5..62f896b 100644 --- a/third_party/crashpad/crashpad/util/file/file_writer.cc +++ b/third_party/crashpad/crashpad/util/file/file_writer.cc
@@ -17,6 +17,7 @@ #include <algorithm> #include <limits.h> +#include <string.h> #include "base/logging.h" #include "base/numerics/safe_conversions.h"
diff --git a/third_party/crashpad/crashpad/util/file/file_writer.h b/third_party/crashpad/crashpad/util/file/file_writer.h index a0d547e..0af8f87 100644 --- a/third_party/crashpad/crashpad/util/file/file_writer.h +++ b/third_party/crashpad/crashpad/util/file/file_writer.h
@@ -15,12 +15,13 @@ #ifndef CRASHPAD_UTIL_FILE_FILE_WRITER_H_ #define CRASHPAD_UTIL_FILE_FILE_WRITER_H_ +#include <stddef.h> #include <sys/types.h> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" #include "util/file/file_seeker.h"
diff --git a/third_party/crashpad/crashpad/util/file/string_file.h b/third_party/crashpad/crashpad/util/file/string_file.h index 05f57072..9c0d793 100644 --- a/third_party/crashpad/crashpad/util/file/string_file.h +++ b/third_party/crashpad/crashpad/util/file/string_file.h
@@ -15,11 +15,12 @@ #ifndef CRASHPAD_UTIL_FILE_STRING_FILE_H_ #define CRASHPAD_UTIL_FILE_STRING_FILE_H_ +#include <stddef.h> #include <sys/types.h> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/numerics/safe_math.h" #include "util/file/file_io.h" #include "util/file/file_reader.h"
diff --git a/third_party/crashpad/crashpad/util/file/string_file_test.cc b/third_party/crashpad/crashpad/util/file/string_file_test.cc index 0990daf..a961aa0 100644 --- a/third_party/crashpad/crashpad/util/file/string_file_test.cc +++ b/third_party/crashpad/crashpad/util/file/string_file_test.cc
@@ -14,6 +14,8 @@ #include "util/file/string_file.h" +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <algorithm>
diff --git a/third_party/crashpad/crashpad/util/mac/checked_mach_address_range.h b/third_party/crashpad/crashpad/util/mac/checked_mach_address_range.h index e64e3d1..e8b98cc 100644 --- a/third_party/crashpad/crashpad/util/mac/checked_mach_address_range.h +++ b/third_party/crashpad/crashpad/util/mac/checked_mach_address_range.h
@@ -16,6 +16,7 @@ #define CRASHPAD_UTIL_MAC_CHECKED_MACH_ADDRESS_RANGE_H_ #include <mach/mach.h> +#include <stddef.h> #include "util/numeric/checked_address_range.h"
diff --git a/third_party/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc b/third_party/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc index 702715d..571fe2e 100644 --- a/third_party/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc +++ b/third_party/crashpad/crashpad/util/mac/checked_mach_address_range_test.cc
@@ -15,10 +15,11 @@ #include "util/mac/checked_mach_address_range.h" #include <mach/mach.h> +#include <stddef.h> #include <limits> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/mac/launchd.h b/third_party/crashpad/crashpad/util/mac/launchd.h index 03f8bf0..d1ddbbb 100644 --- a/third_party/crashpad/crashpad/util/mac/launchd.h +++ b/third_party/crashpad/crashpad/util/mac/launchd.h
@@ -17,6 +17,7 @@ #include <CoreFoundation/CoreFoundation.h> #include <launch.h> +#include <stddef.h> namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mac/launchd_test.mm b/third_party/crashpad/crashpad/util/mac/launchd_test.mm index 8f60fc9..7c86400 100644 --- a/third_party/crashpad/crashpad/util/mac/launchd_test.mm +++ b/third_party/crashpad/crashpad/util/mac/launchd_test.mm
@@ -16,13 +16,15 @@ #import <Foundation/Foundation.h> #include <launch.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <cmath> #include <limits> -#include "base/basictypes.h" #include "base/mac/scoped_launch_data.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/stdlib/objc.h"
diff --git a/third_party/crashpad/crashpad/util/mac/mac_util.cc b/third_party/crashpad/crashpad/util/mac/mac_util.cc index a792e51..a2e8651a 100644 --- a/third_party/crashpad/crashpad/util/mac/mac_util.cc +++ b/third_party/crashpad/crashpad/util/mac/mac_util.cc
@@ -16,6 +16,7 @@ #include <CoreFoundation/CoreFoundation.h> #include <IOKit/IOKitLib.h> +#include <stddef.h> #include <string.h> #include <sys/types.h> #include <sys/utsname.h>
diff --git a/third_party/crashpad/crashpad/util/mac/xattr.cc b/third_party/crashpad/crashpad/util/mac/xattr.cc index cb72e06e..bdd2f80 100644 --- a/third_party/crashpad/crashpad/util/mac/xattr.cc +++ b/third_party/crashpad/crashpad/util/mac/xattr.cc
@@ -15,14 +15,14 @@ #include "util/mac/xattr.h" #include <errno.h> +#include <stddef.h> #include <stdint.h> #include <sys/xattr.h> -#include "base/basictypes.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" -#include "base/strings/stringprintf.h" #include "base/strings/string_number_conversions.h" +#include "base/strings/stringprintf.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc b/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc index a7b6e57..74c6fc6 100644 --- a/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc +++ b/third_party/crashpad/crashpad/util/mach/child_port_handshake.cc
@@ -16,6 +16,7 @@ #include <errno.h> #include <pthread.h> +#include <stdint.h> #include <sys/event.h> #include <sys/socket.h> #include <sys/time.h> @@ -28,6 +29,7 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/posix/eintr_wrapper.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h"
diff --git a/third_party/crashpad/crashpad/util/mach/child_port_handshake.h b/third_party/crashpad/crashpad/util/mach/child_port_handshake.h index 666f59b..50de118 100644 --- a/third_party/crashpad/crashpad/util/mach/child_port_handshake.h +++ b/third_party/crashpad/crashpad/util/mach/child_port_handshake.h
@@ -19,8 +19,8 @@ #include <string> -#include "base/basictypes.h" #include "base/files/scoped_file.h" +#include "base/macros.h" #include "util/mach/child_port_types.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/child_port_handshake_test.cc b/third_party/crashpad/crashpad/util/mach/child_port_handshake_test.cc index f77107b5..fedf138 100644 --- a/third_party/crashpad/crashpad/util/mach/child_port_handshake_test.cc +++ b/third_party/crashpad/crashpad/util/mach/child_port_handshake_test.cc
@@ -15,6 +15,7 @@ #include "util/mach/child_port_handshake.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/multiprocess.h" #include "util/mach/child_port_types.h"
diff --git a/third_party/crashpad/crashpad/util/mach/child_port_server.cc b/third_party/crashpad/crashpad/util/mach/child_port_server.cc index 4fc723a..40aae8a 100644 --- a/third_party/crashpad/crashpad/util/mach/child_port_server.cc +++ b/third_party/crashpad/crashpad/util/mach/child_port_server.cc
@@ -15,6 +15,7 @@ #include "util/mach/child_port_server.h" #include "base/logging.h" +#include "base/macros.h" #include "util/mach/child_portServer.h" #include "util/mach/mach_message.h"
diff --git a/third_party/crashpad/crashpad/util/mach/child_port_server.h b/third_party/crashpad/crashpad/util/mach/child_port_server.h index bc42cc0..867238c 100644 --- a/third_party/crashpad/crashpad/util/mach/child_port_server.h +++ b/third_party/crashpad/crashpad/util/mach/child_port_server.h
@@ -16,10 +16,11 @@ #define CRASHPAD_UTIL_MACH_CHILD_PORT_SERVER_H_ #include <mach/mach.h> +#include <stddef.h> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/child_port_types.h" #include "util/mach/mach_message_server.h"
diff --git a/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.h b/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.h index 6da957b..e386fce9 100644 --- a/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.h +++ b/third_party/crashpad/crashpad/util/mach/composite_mach_message_server.h
@@ -16,11 +16,12 @@ #define CRASHPAD_UTIL_MACH_COMPOSITE_MACH_MESSAGE_SERVER_H_ #include <mach/mach.h> +#include <stddef.h> #include <map> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/mach_message_server.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc b/third_party/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc index 0af8206..a4d713f 100644 --- a/third_party/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc +++ b/third_party/crashpad/crashpad/util/mach/composite_mach_message_server_test.cc
@@ -14,6 +14,9 @@ #include "util/mach/composite_mach_message_server.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/gtest_death_check.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc b/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc index 2495a60..93f7005 100644 --- a/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc +++ b/third_party/crashpad/crashpad/util/mach/exc_client_variants.cc
@@ -14,6 +14,8 @@ #include "util/mach/exc_client_variants.h" +#include <stddef.h> + #include <vector> #include "base/logging.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exc_client_variants_test.cc b/third_party/crashpad/crashpad/util/mach/exc_client_variants_test.cc index 49bf78c3..3de94d1 100644 --- a/third_party/crashpad/crashpad/util/mach/exc_client_variants_test.cc +++ b/third_party/crashpad/crashpad/util/mach/exc_client_variants_test.cc
@@ -16,9 +16,10 @@ #include <mach/mach.h> #include <pthread.h> +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc b/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc index c5a74a3..7b1f5324 100644 --- a/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc +++ b/third_party/crashpad/crashpad/util/mach/exc_server_variants.cc
@@ -21,11 +21,12 @@ #include <vector> #include "base/logging.h" +#include "base/macros.h" #include "util/mac/mac_util.h" #include "util/mach/composite_mach_message_server.h" #include "util/mach/exc.h" -#include "util/mach/exception_behaviors.h" #include "util/mach/excServer.h" +#include "util/mach/exception_behaviors.h" #include "util/mach/mach_exc.h" #include "util/mach/mach_excServer.h" #include "util/mach/mach_message.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exc_server_variants.h b/third_party/crashpad/crashpad/util/mach/exc_server_variants.h index 95d1c12..5cfc9c6 100644 --- a/third_party/crashpad/crashpad/util/mach/exc_server_variants.h +++ b/third_party/crashpad/crashpad/util/mach/exc_server_variants.h
@@ -16,10 +16,11 @@ #define CRASHPAD_UTIL_MACH_EXC_SERVER_VARIANTS_H_ #include <mach/mach.h> +#include <stddef.h> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/mach/mach_extensions.h" #include "util/mach/mach_message_server.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exc_server_variants_test.cc b/third_party/crashpad/crashpad/util/mach/exc_server_variants_test.cc index 68674b6..be3b3d04 100644 --- a/third_party/crashpad/crashpad/util/mach/exc_server_variants_test.cc +++ b/third_party/crashpad/crashpad/util/mach/exc_server_variants_test.cc
@@ -15,9 +15,13 @@ #include "util/mach/exc_server_variants.h" #include <mach/mach.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exception_behaviors_test.cc b/third_party/crashpad/crashpad/util/mach/exception_behaviors_test.cc index cbde600..07ae297 100644 --- a/third_party/crashpad/crashpad/util/mach/exception_behaviors_test.cc +++ b/third_party/crashpad/crashpad/util/mach/exception_behaviors_test.cc
@@ -14,7 +14,9 @@ #include "util/mach/exception_behaviors.h" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/mach/mach_extensions.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exception_ports.h b/third_party/crashpad/crashpad/util/mach/exception_ports.h index 7f23c5e5..86197ce 100644 --- a/third_party/crashpad/crashpad/util/mach/exception_ports.h +++ b/third_party/crashpad/crashpad/util/mach/exception_ports.h
@@ -16,10 +16,11 @@ #define CRASHPAD_UTIL_MACH_EXCEPTION_PORTS_H_ #include <mach/mach.h> +#include <stddef.h> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc b/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc index e6e1d56..37c7d11 100644 --- a/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc +++ b/third_party/crashpad/crashpad/util/mach/exception_ports_test.cc
@@ -19,10 +19,10 @@ #include <signal.h> #include <unistd.h> -#include "base/basictypes.h" #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/mach/exception_types_test.cc b/third_party/crashpad/crashpad/util/mach/exception_types_test.cc index 0520c2e..5d7314e 100644 --- a/third_party/crashpad/crashpad/util/mach/exception_types_test.cc +++ b/third_party/crashpad/crashpad/util/mach/exception_types_test.cc
@@ -16,10 +16,12 @@ #include <kern/exc_resource.h> #include <signal.h> +#include <stddef.h> +#include <stdint.h> #include <sys/types.h> #include <unistd.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/mac/mac_util.h"
diff --git a/third_party/crashpad/crashpad/util/mach/mach_message.h b/third_party/crashpad/crashpad/util/mach/mach_message.h index 2fd8151..d07996e 100644 --- a/third_party/crashpad/crashpad/util/mach/mach_message.h +++ b/third_party/crashpad/crashpad/util/mach/mach_message.h
@@ -16,6 +16,7 @@ #define CRASHPAD_UTIL_MACH_MACH_MESSAGE_H_ #include <mach/mach.h> +#include <stddef.h> #include <stdint.h> #include <sys/types.h>
diff --git a/third_party/crashpad/crashpad/util/mach/mach_message_server.cc b/third_party/crashpad/crashpad/util/mach/mach_message_server.cc index 0af1901..131f7c1 100644 --- a/third_party/crashpad/crashpad/util/mach/mach_message_server.cc +++ b/third_party/crashpad/crashpad/util/mach/mach_message_server.cc
@@ -21,6 +21,7 @@ #include "base/logging.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_vm.h" +#include "base/macros.h" #include "util/mach/mach_message.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/mach_message_server.h b/third_party/crashpad/crashpad/util/mach/mach_message_server.h index 484ee8bb1..0f27019f 100644 --- a/third_party/crashpad/crashpad/util/mach/mach_message_server.h +++ b/third_party/crashpad/crashpad/util/mach/mach_message_server.h
@@ -16,10 +16,11 @@ #define CRASHPAD_UTIL_MACH_MACH_MESSAGE_SERVER_H_ #include <mach/mach.h> +#include <stddef.h> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/mach_message_server_test.cc b/third_party/crashpad/crashpad/util/mach/mach_message_server_test.cc index a59554b..004cbf3 100644 --- a/third_party/crashpad/crashpad/util/mach/mach_message_server_test.cc +++ b/third_party/crashpad/crashpad/util/mach/mach_message_server_test.cc
@@ -15,12 +15,14 @@ #include "util/mach/mach_message_server.h" #include <mach/mach.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <set> -#include "base/basictypes.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" #include "test/mac/mach_multiprocess.h"
diff --git a/third_party/crashpad/crashpad/util/mach/mach_message_test.cc b/third_party/crashpad/crashpad/util/mach/mach_message_test.cc index d77f0dd3..8f6db7af 100644 --- a/third_party/crashpad/crashpad/util/mach/mach_message_test.cc +++ b/third_party/crashpad/crashpad/util/mach/mach_message_test.cc
@@ -14,9 +14,9 @@ #include "util/mach/mach_message.h" +#include <stdint.h> #include <unistd.h> -#include "base/basictypes.h" #include "base/mac/scoped_mach_port.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/mach/notify_server.cc b/third_party/crashpad/crashpad/util/mach/notify_server.cc index 48a4a9e9..da1d2c8 100644 --- a/third_party/crashpad/crashpad/util/mach/notify_server.cc +++ b/third_party/crashpad/crashpad/util/mach/notify_server.cc
@@ -15,8 +15,9 @@ #include "util/mach/notify_server.h" #include "base/logging.h" -#include "util/mach/notifyServer.h" +#include "base/macros.h" #include "util/mach/mach_message.h" +#include "util/mach/notifyServer.h" extern "C" {
diff --git a/third_party/crashpad/crashpad/util/mach/notify_server.h b/third_party/crashpad/crashpad/util/mach/notify_server.h index ce33b21..3be0bcd 100644 --- a/third_party/crashpad/crashpad/util/mach/notify_server.h +++ b/third_party/crashpad/crashpad/util/mach/notify_server.h
@@ -16,10 +16,11 @@ #define CRASHPAD_UTIL_MACH_NOTIFY_SERVER_H_ #include <mach/mach.h> +#include <stddef.h> #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/mach/mach_message_server.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/notify_server_test.cc b/third_party/crashpad/crashpad/util/mach/notify_server_test.cc index 445e35b..3659f8b 100644 --- a/third_party/crashpad/crashpad/util/mach/notify_server_test.cc +++ b/third_party/crashpad/crashpad/util/mach/notify_server_test.cc
@@ -16,6 +16,7 @@ #include "base/compiler_specific.h" #include "base/mac/scoped_mach_port.h" +#include "base/macros.h" #include "gmock/gmock.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.h b/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.h index 4b90aba..389ea5f 100644 --- a/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.h +++ b/third_party/crashpad/crashpad/util/mach/scoped_task_suspend.h
@@ -17,7 +17,7 @@ #include <mach/mach.h> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc b/third_party/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc index b53b83d..0263b19 100644 --- a/third_party/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc +++ b/third_party/crashpad/crashpad/util/mach/scoped_task_suspend_test.cc
@@ -16,6 +16,7 @@ #include <mach/mach.h> +#include "base/macros.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h" #include "test/mac/mach_multiprocess.h"
diff --git a/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach.cc b/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach.cc index fc86b1f..9ff1bc5 100644 --- a/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach.cc +++ b/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach.cc
@@ -14,9 +14,10 @@ #include "util/mach/symbolic_constants_mach.h" +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "util/mach/exception_behaviors.h" #include "util/mach/mach_extensions.h"
diff --git a/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc b/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc index 5f3d7d9..6d36389 100644 --- a/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc +++ b/third_party/crashpad/crashpad/util/mach/symbolic_constants_mach_test.cc
@@ -15,9 +15,10 @@ #include "util/mach/symbolic_constants_mach.h" #include <mach/mach.h> +#include <stddef.h> #include <string.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/mach/task_for_pid.cc b/third_party/crashpad/crashpad/util/mach/task_for_pid.cc index 1f238b1..39ac2f9 100644 --- a/third_party/crashpad/crashpad/util/mach/task_for_pid.cc +++ b/third_party/crashpad/crashpad/util/mach/task_for_pid.cc
@@ -21,7 +21,6 @@ #include <iterator> #include <set> -#include "base/basictypes.h" #include "base/mac/mach_logging.h" #include "base/mac/scoped_mach_port.h" #include "util/posix/process_info.h"
diff --git a/third_party/crashpad/crashpad/util/mach/task_memory.h b/third_party/crashpad/crashpad/util/mach/task_memory.h index 2077d5e..731ff97 100644 --- a/third_party/crashpad/crashpad/util/mach/task_memory.h +++ b/third_party/crashpad/crashpad/util/mach/task_memory.h
@@ -16,11 +16,12 @@ #define CRASHPAD_UTIL_MACH_TASK_MEMORY_H_ #include <mach/mach.h> +#include <stddef.h> #include <string> -#include "base/basictypes.h" #include "base/mac/scoped_mach_vm.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/mach/task_memory_test.cc b/third_party/crashpad/crashpad/util/mach/task_memory_test.cc index 963bc4d..1ebe3e8 100644 --- a/third_party/crashpad/crashpad/util/mach/task_memory_test.cc +++ b/third_party/crashpad/crashpad/util/mach/task_memory_test.cc
@@ -15,6 +15,7 @@ #include "util/mach/task_memory.h" #include <mach/mach.h> +#include <stddef.h> #include <string.h> #include <algorithm> @@ -22,6 +23,7 @@ #include "base/mac/scoped_mach_port.h" #include "base/mac/scoped_mach_vm.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "gtest/gtest.h" #include "test/mac/mach_errors.h"
diff --git a/third_party/crashpad/crashpad/util/misc/clock_mac.cc b/third_party/crashpad/crashpad/util/misc/clock_mac.cc index bb52299e..a7b9fc1 100644 --- a/third_party/crashpad/crashpad/util/misc/clock_mac.cc +++ b/third_party/crashpad/crashpad/util/misc/clock_mac.cc
@@ -15,6 +15,7 @@ #include "util/misc/clock.h" #include <mach/mach_time.h> +#include <stdint.h> #include "base/mac/mach_logging.h"
diff --git a/third_party/crashpad/crashpad/util/misc/clock_posix.cc b/third_party/crashpad/crashpad/util/misc/clock_posix.cc index 2417109..e7c0acf 100644 --- a/third_party/crashpad/crashpad/util/misc/clock_posix.cc +++ b/third_party/crashpad/crashpad/util/misc/clock_posix.cc
@@ -14,6 +14,7 @@ #include "util/misc/clock.h" +#include <stdint.h> #include <time.h> #include "base/logging.h"
diff --git a/third_party/crashpad/crashpad/util/misc/clock_test.cc b/third_party/crashpad/crashpad/util/misc/clock_test.cc index 82ca85fa..4f81aa7 100644 --- a/third_party/crashpad/crashpad/util/misc/clock_test.cc +++ b/third_party/crashpad/crashpad/util/misc/clock_test.cc
@@ -14,13 +14,15 @@ #include "util/misc/clock.h" +#include <stddef.h> #include <stdint.h> #include <algorithm> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/misc/clock_win.cc b/third_party/crashpad/crashpad/util/misc/clock_win.cc index 7231205..b1f99d8 100644 --- a/third_party/crashpad/crashpad/util/misc/clock_win.cc +++ b/third_party/crashpad/crashpad/util/misc/clock_win.cc
@@ -14,8 +14,9 @@ #include "util/misc/clock.h" -#include <sys/types.h> #include <windows.h> +#include <stdint.h> +#include <sys/types.h> namespace {
diff --git a/third_party/crashpad/crashpad/util/misc/initialization_state.h b/third_party/crashpad/crashpad/util/misc/initialization_state.h index b0496e5..85f9b28 100644 --- a/third_party/crashpad/crashpad/util/misc/initialization_state.h +++ b/third_party/crashpad/crashpad/util/misc/initialization_state.h
@@ -17,7 +17,7 @@ #include <stdint.h> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h b/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h index 24b3d077d..e45a6f8 100644 --- a/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h +++ b/third_party/crashpad/crashpad/util/misc/initialization_state_dcheck.h
@@ -17,9 +17,9 @@ //! \file -#include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/logging.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state.h"
diff --git a/third_party/crashpad/crashpad/util/misc/pdb_structures.h b/third_party/crashpad/crashpad/util/misc/pdb_structures.h index 04d76eec..218a7632 100644 --- a/third_party/crashpad/crashpad/util/misc/pdb_structures.h +++ b/third_party/crashpad/crashpad/util/misc/pdb_structures.h
@@ -15,6 +15,8 @@ #ifndef CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_ #define CRASHPAD_UTIL_MISC_PDB_STRUCTURES_H_ +#include <stdint.h> + #include "util/misc/uuid.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/misc/random_string_test.cc b/third_party/crashpad/crashpad/util/misc/random_string_test.cc index 3ef85df..29bc61a 100644 --- a/third_party/crashpad/crashpad/util/misc/random_string_test.cc +++ b/third_party/crashpad/crashpad/util/misc/random_string_test.cc
@@ -14,9 +14,11 @@ #include "util/misc/random_string.h" +#include <stddef.h> + #include <set> -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/misc/scoped_forbid_return.h b/third_party/crashpad/crashpad/util/misc/scoped_forbid_return.h index 8705be7a..4f1e214 100644 --- a/third_party/crashpad/crashpad/util/misc/scoped_forbid_return.h +++ b/third_party/crashpad/crashpad/util/misc/scoped_forbid_return.h
@@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_ #define CRASHPAD_UTIL_MISC_SCOPED_FORBID_RETURN_H_ -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/misc/uuid.cc b/third_party/crashpad/crashpad/util/misc/uuid.cc index ca7b22b1..e1c8556 100644 --- a/third_party/crashpad/crashpad/util/misc/uuid.cc +++ b/third_party/crashpad/crashpad/util/misc/uuid.cc
@@ -22,11 +22,11 @@ #include <stdio.h> #include <string.h> -#include "base/basictypes.h" #include "base/logging.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "base/sys_byteorder.h" +#include "build/build_config.h" #include "util/stdlib/cxx.h" #if defined(OS_MACOSX)
diff --git a/third_party/crashpad/crashpad/util/misc/uuid_test.cc b/third_party/crashpad/crashpad/util/misc/uuid_test.cc index 0dc6b42..86d198d 100644 --- a/third_party/crashpad/crashpad/util/misc/uuid_test.cc +++ b/third_party/crashpad/crashpad/util/misc/uuid_test.cc
@@ -14,14 +14,17 @@ #include "util/misc/uuid.h" +#include <stddef.h> #include <stdint.h> +#include <string.h> #include <string> -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/net/http_body.h b/third_party/crashpad/crashpad/util/net/http_body.h index 1646591..698d898 100644 --- a/third_party/crashpad/crashpad/util/net/http_body.h +++ b/third_party/crashpad/crashpad/util/net/http_body.h
@@ -15,14 +15,15 @@ #ifndef CRASHPAD_UTIL_NET_HTTP_BODY_H_ #define CRASHPAD_UTIL_NET_HTTP_BODY_H_ +#include <stddef.h> #include <stdint.h> #include <sys/types.h> #include <string> #include <vector> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "util/file/file_io.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/net/http_body_test.cc b/third_party/crashpad/crashpad/util/net/http_body_test.cc index ea4d869..3f4ad50 100644 --- a/third_party/crashpad/crashpad/util/net/http_body_test.cc +++ b/third_party/crashpad/crashpad/util/net/http_body_test.cc
@@ -14,6 +14,10 @@ #include "util/net/http_body.h" +#include <stddef.h> +#include <stdint.h> +#include <string.h> + #include "gtest/gtest.h" #include "test/paths.h" #include "util/misc/implicit_cast.h"
diff --git a/third_party/crashpad/crashpad/util/net/http_body_test_util.h b/third_party/crashpad/crashpad/util/net/http_body_test_util.h index 288fcca..98fa3d93 100644 --- a/third_party/crashpad/crashpad/util/net/http_body_test_util.h +++ b/third_party/crashpad/crashpad/util/net/http_body_test_util.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_UTIL_NET_HTTP_BODY_TEST_UTIL_H_ #define CRASHPAD_UTIL_NET_HTTP_BODY_TEST_UTIL_H_ +#include <stddef.h> #include <sys/types.h> #include <string>
diff --git a/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc b/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc index 83186af67..90fae9cd 100644 --- a/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc +++ b/third_party/crashpad/crashpad/util/net/http_multipart_builder.cc
@@ -14,6 +14,8 @@ #include "util/net/http_multipart_builder.h" +#include <stddef.h> + #include <utility> #include <vector>
diff --git a/third_party/crashpad/crashpad/util/net/http_multipart_builder.h b/third_party/crashpad/crashpad/util/net/http_multipart_builder.h index c9e03ce..3ff7776b 100644 --- a/third_party/crashpad/crashpad/util/net/http_multipart_builder.h +++ b/third_party/crashpad/crashpad/util/net/http_multipart_builder.h
@@ -18,8 +18,8 @@ #include <map> #include <string> -#include "base/basictypes.h" #include "base/files/file_path.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/net/http_headers.h"
diff --git a/third_party/crashpad/crashpad/util/net/http_multipart_builder_test.cc b/third_party/crashpad/crashpad/util/net/http_multipart_builder_test.cc index d024c52..76fdec6 100644 --- a/third_party/crashpad/crashpad/util/net/http_multipart_builder_test.cc +++ b/third_party/crashpad/crashpad/util/net/http_multipart_builder_test.cc
@@ -14,6 +14,8 @@ #include "util/net/http_multipart_builder.h" +#include <stddef.h> + #include <vector> #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/net/http_transport.h b/third_party/crashpad/crashpad/util/net/http_transport.h index 333986a..1acc8e0 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport.h +++ b/third_party/crashpad/crashpad/util/net/http_transport.h
@@ -17,7 +17,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "util/net/http_headers.h"
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm index aad505d..3657a9a5 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport_mac.mm +++ b/third_party/crashpad/crashpad/util/net/http_transport_mac.mm
@@ -19,6 +19,7 @@ #include "base/mac/foundation_util.h" #import "base/mac/scoped_nsobject.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "base/strings/sys_string_conversions.h" #include "third_party/apple_cf/CFStreamAbstract.h"
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_test.cc b/third_party/crashpad/crashpad/util/net/http_transport_test.cc index 46e7a5f7..09c8be07 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport_test.cc +++ b/third_party/crashpad/crashpad/util/net/http_transport_test.cc
@@ -14,6 +14,7 @@ #include "util/net/http_transport.h" +#include <stddef.h> #include <stdint.h> #include <stdlib.h> #include <string.h>
diff --git a/third_party/crashpad/crashpad/util/net/http_transport_win.cc b/third_party/crashpad/crashpad/util/net/http_transport_win.cc index 9c3d00f..8adffbe 100644 --- a/third_party/crashpad/crashpad/util/net/http_transport_win.cc +++ b/third_party/crashpad/crashpad/util/net/http_transport_win.cc
@@ -15,9 +15,12 @@ #include "util/net/http_transport.h" #include <windows.h> +#include <stddef.h> +#include <stdint.h> #include <winhttp.h> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/scoped_generic.h" #include "base/strings/stringprintf.h"
diff --git a/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc b/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc index 1d50696..bdd0f15 100644 --- a/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc +++ b/third_party/crashpad/crashpad/util/numeric/checked_address_range.cc
@@ -14,7 +14,10 @@ #include "util/numeric/checked_address_range.h" +#include <stddef.h> + #include "base/strings/stringprintf.h" +#include "build/build_config.h" #if defined(OS_MACOSX) #include <mach/mach.h>
diff --git a/third_party/crashpad/crashpad/util/numeric/checked_address_range.h b/third_party/crashpad/crashpad/util/numeric/checked_address_range.h index 65f85fb..302e27d 100644 --- a/third_party/crashpad/crashpad/util/numeric/checked_address_range.h +++ b/third_party/crashpad/crashpad/util/numeric/checked_address_range.h
@@ -19,6 +19,7 @@ #include <string> +#include "base/macros.h" #include "build/build_config.h" #include "util/numeric/checked_range.h"
diff --git a/third_party/crashpad/crashpad/util/numeric/checked_address_range_test.cc b/third_party/crashpad/crashpad/util/numeric/checked_address_range_test.cc index d902387c..22ed136 100644 --- a/third_party/crashpad/crashpad/util/numeric/checked_address_range_test.cc +++ b/third_party/crashpad/crashpad/util/numeric/checked_address_range_test.cc
@@ -14,10 +14,13 @@ #include "util/numeric/checked_address_range.h" +#include <stddef.h> +#include <stdint.h> + #include <limits> -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "build/build_config.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/numeric/checked_range.h b/third_party/crashpad/crashpad/util/numeric/checked_range.h index 972a038..69fe9df 100644 --- a/third_party/crashpad/crashpad/util/numeric/checked_range.h +++ b/third_party/crashpad/crashpad/util/numeric/checked_range.h
@@ -17,7 +17,6 @@ #include <limits> -#include "base/basictypes.h" #include "base/logging.h" #include "base/numerics/safe_conversions.h" #include "base/numerics/safe_math.h"
diff --git a/third_party/crashpad/crashpad/util/numeric/checked_range_test.cc b/third_party/crashpad/crashpad/util/numeric/checked_range_test.cc index ea2e6ed..1efceff 100644 --- a/third_party/crashpad/crashpad/util/numeric/checked_range_test.cc +++ b/third_party/crashpad/crashpad/util/numeric/checked_range_test.cc
@@ -14,12 +14,13 @@ #include "util/numeric/checked_range.h" +#include <stddef.h> #include <stdint.h> #include <limits> -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/numeric/int128_test.cc b/third_party/crashpad/crashpad/util/numeric/int128_test.cc index e2f02a4..f0e90dcc 100644 --- a/third_party/crashpad/crashpad/util/numeric/int128_test.cc +++ b/third_party/crashpad/crashpad/util/numeric/int128_test.cc
@@ -14,7 +14,9 @@ #include "util/numeric/int128.h" -#include "base/basictypes.h" +#include <stdint.h> + +#include "build/build_config.h" #include "gtest/gtest.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/posix/close_stdio.cc b/third_party/crashpad/crashpad/util/posix/close_stdio.cc index 8ff59d0..d589294 100644 --- a/third_party/crashpad/crashpad/util/posix/close_stdio.cc +++ b/third_party/crashpad/crashpad/util/posix/close_stdio.cc
@@ -18,7 +18,6 @@ #include <paths.h> #include <unistd.h> -#include "base/basictypes.h" #include "base/files/scoped_file.h" #include "base/logging.h" #include "base/posix/eintr_wrapper.h"
diff --git a/third_party/crashpad/crashpad/util/posix/process_info.h b/third_party/crashpad/crashpad/util/posix/process_info.h index 4761cf3..5aeda25a 100644 --- a/third_party/crashpad/crashpad/util/posix/process_info.h +++ b/third_party/crashpad/crashpad/util/posix/process_info.h
@@ -24,7 +24,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "util/misc/initialization_state_dcheck.h"
diff --git a/third_party/crashpad/crashpad/util/posix/process_info_mac.cc b/third_party/crashpad/crashpad/util/posix/process_info_mac.cc index 17d205a..90a74cb8 100644 --- a/third_party/crashpad/crashpad/util/posix/process_info_mac.cc +++ b/third_party/crashpad/crashpad/util/posix/process_info_mac.cc
@@ -14,10 +14,12 @@ #include "util/posix/process_info.h" +#include <stddef.h> #include <string.h> #include "base/logging.h" #include "base/mac/mach_logging.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/posix/process_info_test.cc b/third_party/crashpad/crashpad/util/posix/process_info_test.cc index dd0844b..a5a90be 100644 --- a/third_party/crashpad/crashpad/util/posix/process_info_test.cc +++ b/third_party/crashpad/crashpad/util/posix/process_info_test.cc
@@ -14,6 +14,7 @@ #include "util/posix/process_info.h" +#include <stddef.h> #include <time.h> #include <unistd.h>
diff --git a/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc b/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc index 326be9f3..b8ea0d5 100644 --- a/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc +++ b/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc
@@ -14,10 +14,13 @@ #include "util/posix/symbolic_constants_posix.h" +#include <stddef.h> +#include <string.h> #include <sys/signal.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "util/misc/implicit_cast.h" #include "util/stdlib/string_number_conversion.h"
diff --git a/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc b/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc index db3193d..6a157a7f 100644 --- a/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc +++ b/third_party/crashpad/crashpad/util/posix/symbolic_constants_posix_test.cc
@@ -14,11 +14,13 @@ #include "util/posix/symbolic_constants_posix.h" +#include <stddef.h> #include <sys/signal.h> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/string_piece.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "gtest/gtest.h" #define NUL_TEST_DATA(string) { string, arraysize(string) - 1 }
diff --git a/third_party/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc b/third_party/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc index fe3b9e6..ef5235d 100644 --- a/third_party/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc +++ b/third_party/crashpad/crashpad/util/stdlib/aligned_allocator_test.cc
@@ -14,8 +14,10 @@ #include "util/stdlib/aligned_allocator.h" +#include <stddef.h> #include <stdint.h> +#include "build/build_config.h" #include "gtest/gtest.h" #if defined(OS_WIN)
diff --git a/third_party/crashpad/crashpad/util/stdlib/pointer_container.h b/third_party/crashpad/crashpad/util/stdlib/pointer_container.h index cb3e836..c835465 100644 --- a/third_party/crashpad/crashpad/util/stdlib/pointer_container.h +++ b/third_party/crashpad/crashpad/util/stdlib/pointer_container.h
@@ -17,7 +17,7 @@ #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/stl_util.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc b/third_party/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc index 97d3152..081b922 100644 --- a/third_party/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc +++ b/third_party/crashpad/crashpad/util/stdlib/string_number_conversion_test.cc
@@ -14,11 +14,13 @@ #include "util/stdlib/string_number_conversion.h" -#include "base/basictypes.h" -#include "gtest/gtest.h" +#include <stddef.h> #include <limits> +#include "base/macros.h" +#include "gtest/gtest.h" + namespace crashpad { namespace test { namespace {
diff --git a/third_party/crashpad/crashpad/util/stdlib/strlcpy.h b/third_party/crashpad/crashpad/util/stdlib/strlcpy.h index 3fcc270..6235ead 100644 --- a/third_party/crashpad/crashpad/util/stdlib/strlcpy.h +++ b/third_party/crashpad/crashpad/util/stdlib/strlcpy.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_UTIL_STDLIB_STRLCPY_H_ #define CRASHPAD_UTIL_STDLIB_STRLCPY_H_ +#include <stddef.h> #include <stdint.h> #include "base/strings/string16.h"
diff --git a/third_party/crashpad/crashpad/util/stdlib/strlcpy_test.cc b/third_party/crashpad/crashpad/util/stdlib/strlcpy_test.cc index b9af201..d666c048 100644 --- a/third_party/crashpad/crashpad/util/stdlib/strlcpy_test.cc +++ b/third_party/crashpad/crashpad/util/stdlib/strlcpy_test.cc
@@ -14,12 +14,13 @@ #include "util/stdlib/strlcpy.h" +#include <stddef.h> #include <string.h> #include <algorithm> -#include "base/basictypes.h" #include "base/format_macros.h" +#include "base/macros.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/stdlib/strnlen.cc b/third_party/crashpad/crashpad/util/stdlib/strnlen.cc index 3016bf63..fccefdc 100644 --- a/third_party/crashpad/crashpad/util/stdlib/strnlen.cc +++ b/third_party/crashpad/crashpad/util/stdlib/strnlen.cc
@@ -12,6 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include "build/build_config.h" #include "util/stdlib/strnlen.h" #if defined(OS_MACOSX) && MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7
diff --git a/third_party/crashpad/crashpad/util/stdlib/strnlen.h b/third_party/crashpad/crashpad/util/stdlib/strnlen.h index f1bbe63..071f10d 100644 --- a/third_party/crashpad/crashpad/util/stdlib/strnlen.h +++ b/third_party/crashpad/crashpad/util/stdlib/strnlen.h
@@ -15,6 +15,7 @@ #ifndef CRASHPAD_UTIL_STDLIB_STRNLEN_H_ #define CRASHPAD_UTIL_STDLIB_STRNLEN_H_ +#include <stddef.h> #include <string.h> #include "build/build_config.h"
diff --git a/third_party/crashpad/crashpad/util/string/split_string.cc b/third_party/crashpad/crashpad/util/string/split_string.cc index 2123b4d..76e7fc8 100644 --- a/third_party/crashpad/crashpad/util/string/split_string.cc +++ b/third_party/crashpad/crashpad/util/string/split_string.cc
@@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <stddef.h> + #include "util/string/split_string.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc b/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc index 973f0a5d..f596648 100644 --- a/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc +++ b/third_party/crashpad/crashpad/util/synchronization/semaphore_posix.cc
@@ -20,6 +20,7 @@ #include "base/logging.h" #include "base/posix/eintr_wrapper.h" +#include "build/build_config.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/synchronization/semaphore_test.cc b/third_party/crashpad/crashpad/util/synchronization/semaphore_test.cc index f359cbd..46e872d 100644 --- a/third_party/crashpad/crashpad/util/synchronization/semaphore_test.cc +++ b/third_party/crashpad/crashpad/util/synchronization/semaphore_test.cc
@@ -14,12 +14,15 @@ #include "util/synchronization/semaphore.h" +#include <stddef.h> + +#include "build/build_config.h" +#include "gtest/gtest.h" + #if defined(OS_POSIX) #include <pthread.h> #endif // OS_POSIX -#include "gtest/gtest.h" - namespace crashpad { namespace test { namespace {
diff --git a/third_party/crashpad/crashpad/util/thread/thread.h b/third_party/crashpad/crashpad/util/thread/thread.h index b1801f8..595d308 100644 --- a/third_party/crashpad/crashpad/util/thread/thread.h +++ b/third_party/crashpad/crashpad/util/thread/thread.h
@@ -15,7 +15,7 @@ #ifndef CRASHPAD_UTIL_THREAD_THREAD_H_ #define CRASHPAD_UTIL_THREAD_THREAD_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #if defined(OS_POSIX)
diff --git a/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc b/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc index bada15a..8a70beda 100644 --- a/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc +++ b/third_party/crashpad/crashpad/util/thread/thread_log_messages.cc
@@ -14,8 +14,11 @@ #include "util/thread/thread_log_messages.h" +#include <stddef.h> + #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/threading/thread_local_storage.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/thread/thread_log_messages.h b/third_party/crashpad/crashpad/util/thread/thread_log_messages.h index 3f850df94..e8eef35 100644 --- a/third_party/crashpad/crashpad/util/thread/thread_log_messages.h +++ b/third_party/crashpad/crashpad/util/thread/thread_log_messages.h
@@ -18,7 +18,7 @@ #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/thread/thread_log_messages_test.cc b/third_party/crashpad/crashpad/util/thread/thread_log_messages_test.cc index e2590826..3f32f33 100644 --- a/third_party/crashpad/crashpad/util/thread/thread_log_messages_test.cc +++ b/third_party/crashpad/crashpad/util/thread/thread_log_messages_test.cc
@@ -14,9 +14,11 @@ #include "util/thread/thread_log_messages.h" +#include <stddef.h> #include <string.h> #include "base/logging.h" +#include "base/macros.h" #include "base/strings/stringprintf.h" #include "gtest/gtest.h" #include "util/thread/thread.h"
diff --git a/third_party/crashpad/crashpad/util/thread/thread_test.cc b/third_party/crashpad/crashpad/util/thread/thread_test.cc index 7f7cf61..d92544b6 100644 --- a/third_party/crashpad/crashpad/util/thread/thread_test.cc +++ b/third_party/crashpad/crashpad/util/thread/thread_test.cc
@@ -14,7 +14,7 @@ #include "util/thread/thread.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "gtest/gtest.h" #include "util/synchronization/semaphore.h"
diff --git a/third_party/crashpad/crashpad/util/win/capture_context_test.cc b/third_party/crashpad/crashpad/util/win/capture_context_test.cc index 270ecb3..19f849f9 100644 --- a/third_party/crashpad/crashpad/util/win/capture_context_test.cc +++ b/third_party/crashpad/crashpad/util/win/capture_context_test.cc
@@ -14,11 +14,12 @@ #include "util/win/capture_context.h" +#include <stddef.h> #include <stdint.h> #include <algorithm> -#include "base/basictypes.h" +#include "base/macros.h" #include "build/build_config.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/win/command_line.cc b/third_party/crashpad/crashpad/util/win/command_line.cc index 5829c12..90671b1 100644 --- a/third_party/crashpad/crashpad/util/win/command_line.cc +++ b/third_party/crashpad/crashpad/util/win/command_line.cc
@@ -12,6 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <stddef.h> + #include "util/win/command_line.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/win/command_line_test.cc b/third_party/crashpad/crashpad/util/win/command_line_test.cc index d317927..16f9a6b 100644 --- a/third_party/crashpad/crashpad/util/win/command_line_test.cc +++ b/third_party/crashpad/crashpad/util/win/command_line_test.cc
@@ -16,9 +16,10 @@ #include <windows.h> #include <shellapi.h> +#include <stddef.h> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" #include "base/scoped_generic.h" #include "gtest/gtest.h" #include "test/errors.h"
diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc index 5559efb..347dc50 100644 --- a/third_party/crashpad/crashpad/util/win/exception_handler_server.cc +++ b/third_party/crashpad/crashpad/util/win/exception_handler_server.cc
@@ -15,11 +15,14 @@ #include "util/win/exception_handler_server.h" #include <sddl.h> +#include <stddef.h> +#include <stdint.h> #include <string.h> #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "base/numerics/safe_conversions.h" #include "base/rand_util.h" #include "base/strings/stringprintf.h"
diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server.h b/third_party/crashpad/crashpad/util/win/exception_handler_server.h index 46141414..34c52783 100644 --- a/third_party/crashpad/crashpad/util/win/exception_handler_server.h +++ b/third_party/crashpad/crashpad/util/win/exception_handler_server.h
@@ -18,7 +18,7 @@ #include <set> #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/lock.h" #include "util/file/file_io.h" #include "util/win/address_types.h"
diff --git a/third_party/crashpad/crashpad/util/win/exception_handler_server_test.cc b/third_party/crashpad/crashpad/util/win/exception_handler_server_test.cc index ee31e26..1dbc64f9 100644 --- a/third_party/crashpad/crashpad/util/win/exception_handler_server_test.cc +++ b/third_party/crashpad/crashpad/util/win/exception_handler_server_test.cc
@@ -15,11 +15,12 @@ #include "util/win/exception_handler_server.h" #include <windows.h> +#include <stddef.h> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/strings/utf_string_conversions.h" #include "client/crashpad_client.h" #include "gtest/gtest.h"
diff --git a/third_party/crashpad/crashpad/util/win/module_version.cc b/third_party/crashpad/crashpad/util/win/module_version.cc index f49df0c..62f9e42 100644 --- a/third_party/crashpad/crashpad/util/win/module_version.cc +++ b/third_party/crashpad/crashpad/util/win/module_version.cc
@@ -15,6 +15,7 @@ #include "util/win/module_version.h" #include <windows.h> +#include <stdint.h> #include "base/logging.h" #include "base/memory/scoped_ptr.h"
diff --git a/third_party/crashpad/crashpad/util/win/ntstatus_logging.cc b/third_party/crashpad/crashpad/util/win/ntstatus_logging.cc index 4c243cc..4460105 100644 --- a/third_party/crashpad/crashpad/util/win/ntstatus_logging.cc +++ b/third_party/crashpad/crashpad/util/win/ntstatus_logging.cc
@@ -16,6 +16,7 @@ #include <string> +#include "base/macros.h" #include "base/strings/stringprintf.h" namespace {
diff --git a/third_party/crashpad/crashpad/util/win/ntstatus_logging.h b/third_party/crashpad/crashpad/util/win/ntstatus_logging.h index 0dc2460..7eececc 100644 --- a/third_party/crashpad/crashpad/util/win/ntstatus_logging.h +++ b/third_party/crashpad/crashpad/util/win/ntstatus_logging.h
@@ -17,8 +17,8 @@ #include <windows.h> -#include "base/basictypes.h" #include "base/logging.h" +#include "base/macros.h" namespace logging {
diff --git a/third_party/crashpad/crashpad/util/win/process_info.cc b/third_party/crashpad/crashpad/util/win/process_info.cc index 5628e04..a9a08a8 100644 --- a/third_party/crashpad/crashpad/util/win/process_info.cc +++ b/third_party/crashpad/crashpad/util/win/process_info.cc
@@ -14,6 +14,7 @@ #include "util/win/process_info.h" +#include <stddef.h> #include <winternl.h> #include <algorithm>
diff --git a/third_party/crashpad/crashpad/util/win/process_info.h b/third_party/crashpad/crashpad/util/win/process_info.h index 0362445..ec53513 100644 --- a/third_party/crashpad/crashpad/util/win/process_info.h +++ b/third_party/crashpad/crashpad/util/win/process_info.h
@@ -15,13 +15,14 @@ #ifndef CRASHPAD_UTIL_WIN_PROCESS_INFO_H_ #define CRASHPAD_UTIL_WIN_PROCESS_INFO_H_ -#include <sys/types.h> #include <windows.h> +#include <stdint.h> +#include <sys/types.h> #include <string> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "util/misc/initialization_state_dcheck.h" #include "util/numeric/checked_range.h" #include "util/stdlib/aligned_allocator.h"
diff --git a/third_party/crashpad/crashpad/util/win/process_info_test.cc b/third_party/crashpad/crashpad/util/win/process_info_test.cc index 6917ed9..84c4ff3a 100644 --- a/third_party/crashpad/crashpad/util/win/process_info_test.cc +++ b/third_party/crashpad/crashpad/util/win/process_info_test.cc
@@ -16,6 +16,7 @@ #include <dbghelp.h> #include <intrin.h> +#include <stddef.h> #include <wchar.h> #include "base/files/file_path.h" @@ -25,8 +26,8 @@ #include "build/build_config.h" #include "gtest/gtest.h" #include "test/errors.h" -#include "test/scoped_temp_dir.h" #include "test/paths.h" +#include "test/scoped_temp_dir.h" #include "test/win/child_launcher.h" #include "util/file/file_io.h" #include "util/misc/random_string.h"
diff --git a/third_party/crashpad/crashpad/util/win/scoped_process_suspend.h b/third_party/crashpad/crashpad/util/win/scoped_process_suspend.h index dad2e29..e5adea9c 100644 --- a/third_party/crashpad/crashpad/util/win/scoped_process_suspend.h +++ b/third_party/crashpad/crashpad/util/win/scoped_process_suspend.h
@@ -17,7 +17,7 @@ #include <windows.h> -#include "base/basictypes.h" +#include "base/macros.h" namespace crashpad {
diff --git a/third_party/crashpad/crashpad/util/win/scoped_process_suspend_test.cc b/third_party/crashpad/crashpad/util/win/scoped_process_suspend_test.cc index 5b7813df..585be8ad 100644 --- a/third_party/crashpad/crashpad/util/win/scoped_process_suspend_test.cc +++ b/third_party/crashpad/crashpad/util/win/scoped_process_suspend_test.cc
@@ -19,6 +19,7 @@ #include <algorithm> #include <vector> +#include "base/macros.h" #include "gtest/gtest.h" #include "test/errors.h" #include "test/win/win_child_process.h"
diff --git a/third_party/crashpad/crashpad/util/win/time.cc b/third_party/crashpad/crashpad/util/win/time.cc index 1665b9c..ad9f884 100644 --- a/third_party/crashpad/crashpad/util/win/time.cc +++ b/third_party/crashpad/crashpad/util/win/time.cc
@@ -15,6 +15,7 @@ #include "util/win/time.h" #include <inttypes.h> +#include <stdint.h> #include "base/logging.h"
diff --git a/third_party/hunspell/google/bdict.cc b/third_party/hunspell/google/bdict.cc index 3756f35..1796257 100644 --- a/third_party/hunspell/google/bdict.cc +++ b/third_party/hunspell/google/bdict.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <string.h> + #include "third_party/hunspell/google/bdict.h" // static @@ -24,7 +26,7 @@ const hunspell::BDict::AffHeader* aff_header = reinterpret_cast<const hunspell::BDict::AffHeader*>( &bdict_data[header->aff_offset]); - if (aff_header->affix_group_offset + sizeof(uint32) > bdict_length) + if (aff_header->affix_group_offset + sizeof(uint32_t) > bdict_length) return false; // The new BDICT header has a MD5 digest of the dictionary data. Compare the
diff --git a/third_party/hunspell/google/bdict.h b/third_party/hunspell/google/bdict.h index faa7b84c..dc33369 100644 --- a/third_party/hunspell/google/bdict.h +++ b/third_party/hunspell/google/bdict.h
@@ -5,7 +5,9 @@ #ifndef THIRD_PARTY_HUNSPELL_GOOGLE_BDICT_H_ #define THIRD_PARTY_HUNSPELL_GOOGLE_BDICT_H_ -#include "base/basictypes.h" +#include <stddef.h> +#include <stdint.h> + #include "base/md5.h" // BDict (binary dictionary) format. All offsets are little endian. @@ -107,15 +109,15 @@ MINOR_VERSION = 0 }; struct Header { - uint32 signature; + uint32_t signature; // Major versions are incompatible with other major versions. Minor versions // should be readable by older programs expecting the same major version. - uint16 major_version; - uint16 minor_version; + uint16_t major_version; + uint16_t minor_version; - uint32 aff_offset; // Offset of the aff data. - uint32 dic_offset; // Offset of the dic data. + uint32_t aff_offset; // Offset of the aff data. + uint32_t dic_offset; // Offset of the dic data. // Added by version 2.0. base::MD5Digest digest; // MD5 digest of the aff data and the dic data. @@ -124,10 +126,10 @@ // AFF section =============================================================== struct AffHeader { - uint32 affix_group_offset; - uint32 affix_rule_offset; - uint32 rep_offset; // Replacements table. - uint32 other_offset; + uint32_t affix_group_offset; + uint32_t affix_rule_offset; + uint32_t rep_offset; // Replacements table. + uint32_t other_offset; }; // DIC section ===============================================================
diff --git a/third_party/hunspell/google/bdict_reader.cc b/third_party/hunspell/google/bdict_reader.cc index ddd3c88..a70127d 100644 --- a/third_party/hunspell/google/bdict_reader.cc +++ b/third_party/hunspell/google/bdict_reader.cc
@@ -4,6 +4,8 @@ #include "third_party/hunspell/google/bdict_reader.h" +#include <stdint.h> + #include "base/logging.h" namespace hunspell { @@ -332,11 +334,11 @@ // Save the end pointer (accounting for an odd number of bytes). size_t array_start = node_offset_ + additional_bytes + 2; - const uint16* const bdict_short_end = reinterpret_cast<const uint16*>( + const uint16_t* const bdict_short_end = reinterpret_cast<const uint16_t*>( &bdict_data_[((bdict_length_ - array_start) & -2) + array_start]); // Process all remaining matches. - const uint16* following_array = reinterpret_cast<const uint16*>( - &bdict_data_[array_start]); + const uint16_t* following_array = + reinterpret_cast<const uint16_t*>(&bdict_data_[array_start]); for (int i = 0; i < BDict::MAX_AFFIXES_PER_WORD - list_offset; i++) { if (&following_array[i] >= bdict_short_end) { is_valid_ = false; @@ -722,7 +724,7 @@ &bdict_data[header_->aff_offset]); // Make sure there is enough room for the affix group count dword. - if (aff_header_->affix_group_offset > bdict_length - sizeof(uint32)) + if (aff_header_->affix_group_offset > bdict_length - sizeof(uint32_t)) return false; // This function is called from SpellCheck::SpellCheckWord(), which blocks
diff --git a/third_party/hunspell/google/bdict_reader.h b/third_party/hunspell/google/bdict_reader.h index c0a889f..51d956be 100644 --- a/third_party/hunspell/google/bdict_reader.h +++ b/third_party/hunspell/google/bdict_reader.h
@@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_HUNSPELL_GOOGLE_BDICT_READER_H_ #define THIRD_PARTY_HUNSPELL_GOOGLE_BDICT_READER_H_ +#include <stddef.h> + #include <string> #include <vector>
diff --git a/third_party/hunspell/google/bdict_writer.cc b/third_party/hunspell/google/bdict_writer.cc index 300ec5e..c413a4f 100644 --- a/third_party/hunspell/google/bdict_writer.cc +++ b/third_party/hunspell/google/bdict_writer.cc
@@ -4,6 +4,9 @@ #include "third_party/hunspell/google/bdict_writer.h" +#include <stddef.h> +#include <stdint.h> + #include "base/logging.h" #include "base/strings/stringprintf.h" #include "third_party/hunspell/google/bdict.h" @@ -445,8 +448,8 @@ header->signature = hunspell::BDict::SIGNATURE; header->major_version = hunspell::BDict::MAJOR_VERSION; header->minor_version = hunspell::BDict::MINOR_VERSION; - header->aff_offset = static_cast<uint32>(aff_offset); - header->dic_offset = static_cast<uint32>(dic_offset); + header->aff_offset = static_cast<uint32_t>(aff_offset); + header->dic_offset = static_cast<uint32_t>(dic_offset); // Write the MD5 digest of the affix information and the dictionary words at // the end of the BDic header. @@ -485,10 +488,10 @@ // Add the header now that we know the offsets. hunspell::BDict::AffHeader* header = reinterpret_cast<hunspell::BDict::AffHeader*>(&(*output)[header_offset]); - header->affix_group_offset = static_cast<uint32>(affix_group_offset); - header->affix_rule_offset = static_cast<uint32>(affix_rule_offset); - header->rep_offset = static_cast<uint32>(rep_offset); - header->other_offset = static_cast<uint32>(other_offset); + header->affix_group_offset = static_cast<uint32_t>(affix_group_offset); + header->affix_rule_offset = static_cast<uint32_t>(affix_rule_offset); + header->rep_offset = static_cast<uint32_t>(rep_offset); + header->other_offset = static_cast<uint32_t>(other_offset); } } // namespace hunspell
diff --git a/third_party/leveldatabase/DEPS b/third_party/leveldatabase/DEPS index da4af4a..398a684 100644 --- a/third_party/leveldatabase/DEPS +++ b/third_party/leveldatabase/DEPS
@@ -1,5 +1,6 @@ include_rules = [ '+base', + '+build', '+testing', # internal includes
diff --git a/third_party/leveldatabase/chromium_logger.h b/third_party/leveldatabase/chromium_logger.h index 933fb51..27ab3abf 100644 --- a/third_party/leveldatabase/chromium_logger.h +++ b/third_party/leveldatabase/chromium_logger.h
@@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_LEVELDATABASE_CHROMIUM_LOGGER_H_ #define THIRD_PARTY_LEVELDATABASE_CHROMIUM_LOGGER_H_ +#include <stdint.h> + #include "base/files/file.h" #include "base/format_macros.h" #include "base/strings/string_util.h" @@ -48,7 +50,7 @@ t.minute, t.second, t.millisecond, - static_cast<uint64>(thread_id)); + static_cast<uint64_t>(thread_id)); // Print the message if (p < limit) {
diff --git a/third_party/leveldatabase/env_chromium.cc b/third_party/leveldatabase/env_chromium.cc index 0b57c6de..3d54d18 100644 --- a/third_party/leveldatabase/env_chromium.cc +++ b/third_party/leveldatabase/env_chromium.cc
@@ -4,6 +4,8 @@ #include "third_party/leveldatabase/env_chromium.h" +#include <utility> + #if defined(OS_POSIX) #include <dirent.h> #include <sys/types.h> @@ -188,7 +190,7 @@ ChromiumRandomAccessFile(const std::string& fname, base::File file, const UMALogger* uma_logger) - : filename_(fname), file_(file.Pass()), uma_logger_(uma_logger) {} + : filename_(fname), file_(std::move(file)), uma_logger_(uma_logger) {} virtual ~ChromiumRandomAccessFile() {} Status Read(uint64_t offset, @@ -766,7 +768,7 @@ } ChromiumFileLock* my_lock = new ChromiumFileLock; - my_lock->file_ = file.Pass(); + my_lock->file_ = std::move(file); my_lock->name_ = fname; *lock = my_lock; return result; @@ -851,7 +853,7 @@ int flags = base::File::FLAG_READ | base::File::FLAG_OPEN; base::File file(FilePath::FromUTF8Unsafe(fname), flags); if (file.IsValid()) { - *result = new ChromiumRandomAccessFile(fname, file.Pass(), this); + *result = new ChromiumRandomAccessFile(fname, std::move(file), this); RecordOpenFilesLimit("Success"); return Status::OK(); }
diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h index 3548d626..5e542ba 100644 --- a/third_party/leveldatabase/port/port_chromium.h +++ b/third_party/leveldatabase/port/port_chromium.h
@@ -7,13 +7,17 @@ #ifndef STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_ #define STORAGE_LEVELDB_PORT_PORT_CHROMIUM_H_ +#include <stddef.h> #include <stdint.h> -#include <string> + #include <cstring> +#include <string> + #include "base/atomicops.h" -#include "base/basictypes.h" +#include "base/macros.h" #include "base/synchronization/condition_variable.h" #include "base/synchronization/lock.h" +#include "build/build_config.h" // Linux's ThreadIdentifier() needs this. #if defined(OS_LINUX)
diff --git a/third_party/libaddressinput/chromium/addressinput_util.cc b/third_party/libaddressinput/chromium/addressinput_util.cc index bda2778..ca10d41d 100644 --- a/third_party/libaddressinput/chromium/addressinput_util.cc +++ b/third_party/libaddressinput/chromium/addressinput_util.cc
@@ -4,6 +4,8 @@ #include "third_party/libaddressinput/chromium/addressinput_util.h" +#include <stddef.h> + #include <algorithm> #include "base/logging.h"
diff --git a/third_party/libaddressinput/chromium/canonicalize_string.cc b/third_party/libaddressinput/chromium/canonicalize_string.cc index e6d3e4e..d1fc1ce 100644 --- a/third_party/libaddressinput/chromium/canonicalize_string.cc +++ b/third_party/libaddressinput/chromium/canonicalize_string.cc
@@ -4,7 +4,10 @@ #include "third_party/libaddressinput/src/cpp/src/util/canonicalize_string.h" +#include <stdint.h> + #include "base/logging.h" +#include "base/macros.h" #include "third_party/icu/source/common/unicode/errorcode.h" #include "third_party/icu/source/common/unicode/locid.h" #include "third_party/icu/source/common/unicode/unistr.h"
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator.h b/third_party/libaddressinput/chromium/chrome_address_validator.h index 76123827..94ae504 100644 --- a/third_party/libaddressinput/chromium/chrome_address_validator.h +++ b/third_party/libaddressinput/chromium/chrome_address_validator.h
@@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_CHROME_ADDRESS_VALIDATOR_H_ #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_CHROME_ADDRESS_VALIDATOR_H_ +#include <stddef.h> + #include <map> #include <string> #include <vector>
diff --git a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc index f10bfee..a7f9861 100644 --- a/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc +++ b/third_party/libaddressinput/chromium/chrome_address_validator_unittest.cc
@@ -4,10 +4,12 @@ #include "third_party/libaddressinput/chromium/chrome_address_validator.h" -#include <cstddef> +#include <stddef.h> #include <string> +#include <utility> #include <vector> +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/strings/utf_string_conversions.h" @@ -738,12 +740,11 @@ class TestAddressValidator : public AddressValidator { public: // Takes ownership of |source| and |storage|. - TestAddressValidator( - scoped_ptr< ::i18n::addressinput::Source> source, - scoped_ptr< ::i18n::addressinput::Storage> storage, - LoadRulesListener* load_rules_listener) - : AddressValidator(source.Pass(), - storage.Pass(), + TestAddressValidator(scoped_ptr<::i18n::addressinput::Source> source, + scoped_ptr<::i18n::addressinput::Storage> storage, + LoadRulesListener* load_rules_listener) + : AddressValidator(std::move(source), + std::move(storage), load_rules_listener) {} virtual ~TestAddressValidator() {}
diff --git a/third_party/libaddressinput/chromium/chrome_metadata_source.cc b/third_party/libaddressinput/chromium/chrome_metadata_source.cc index 0c99aad4..57c5acd 100644 --- a/third_party/libaddressinput/chromium/chrome_metadata_source.cc +++ b/third_party/libaddressinput/chromium/chrome_metadata_source.cc
@@ -4,7 +4,10 @@ #include "third_party/libaddressinput/chromium/chrome_metadata_source.h" +#include <utility> + #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "net/base/io_buffer.h" @@ -82,9 +85,7 @@ ChromeMetadataSource::Request::Request(const std::string& key, scoped_ptr<net::URLFetcher> fetcher, const Callback& callback) - : key(key), - fetcher(fetcher.Pass()), - callback(callback) {} + : key(key), fetcher(std::move(fetcher)), callback(callback) {} void ChromeMetadataSource::Download(const std::string& key, const Callback& downloaded) { @@ -100,7 +101,7 @@ net::LOAD_DO_NOT_SEND_COOKIES | net::LOAD_DO_NOT_SAVE_COOKIES); fetcher->SetRequestContext(getter_); - Request* request = new Request(key, fetcher.Pass(), downloaded); + Request* request = new Request(key, std::move(fetcher), downloaded); request->fetcher->SaveResponseWithWriter( scoped_ptr<net::URLFetcherResponseWriter>( new UnownedStringWriter(&request->data)));
diff --git a/third_party/libaddressinput/chromium/chrome_metadata_source.h b/third_party/libaddressinput/chromium/chrome_metadata_source.h index 79d337e4..624e6e4 100644 --- a/third_party/libaddressinput/chromium/chrome_metadata_source.h +++ b/third_party/libaddressinput/chromium/chrome_metadata_source.h
@@ -8,6 +8,7 @@ #include <map> #include <string> +#include "base/macros.h" #include "net/url_request/url_fetcher_delegate.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/source.h"
diff --git a/third_party/libaddressinput/chromium/chrome_rule_test.cc b/third_party/libaddressinput/chromium/chrome_rule_test.cc index b1b6682..e0d5c2f 100644 --- a/third_party/libaddressinput/chromium/chrome_rule_test.cc +++ b/third_party/libaddressinput/chromium/chrome_rule_test.cc
@@ -4,6 +4,8 @@ #include "third_party/libaddressinput/src/cpp/src/rule.h" +#include <stddef.h> + #include <string> #include "base/strings/utf_string_conversions.h"
diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.cc b/third_party/libaddressinput/chromium/chrome_storage_impl.cc index 3798d81..d85a2fd 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.cc +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.cc
@@ -4,6 +4,8 @@ #include "third_party/libaddressinput/chromium/chrome_storage_impl.h" +#include <utility> + #include "base/memory/scoped_ptr.h" #include "base/prefs/writeable_pref_store.h" #include "base/values.h" @@ -25,7 +27,7 @@ scoped_ptr<base::StringValue> string_value( new base::StringValue(std::string())); string_value->GetString()->swap(*owned_data); - backing_store_->SetValue(key, string_value.Pass(), + backing_store_->SetValue(key, std::move(string_value), WriteablePrefStore::DEFAULT_PREF_WRITE_FLAGS); }
diff --git a/third_party/libaddressinput/chromium/chrome_storage_impl.h b/third_party/libaddressinput/chromium/chrome_storage_impl.h index c8529cc..c2eac2ae 100644 --- a/third_party/libaddressinput/chromium/chrome_storage_impl.h +++ b/third_party/libaddressinput/chromium/chrome_storage_impl.h
@@ -8,6 +8,7 @@ #include <list> #include <string> +#include "base/macros.h" #include "base/memory/scoped_vector.h" #include "base/prefs/pref_store.h" #include "base/scoped_observer.h"
diff --git a/third_party/libaddressinput/chromium/input_suggester.cc b/third_party/libaddressinput/chromium/input_suggester.cc index 5e6c7e7..9b890f111 100644 --- a/third_party/libaddressinput/chromium/input_suggester.cc +++ b/third_party/libaddressinput/chromium/input_suggester.cc
@@ -9,6 +9,7 @@ #include <utility> #include "base/logging.h" +#include "base/macros.h" #include "third_party/libaddressinput/chromium/trie.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_data.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/callback.h"
diff --git a/third_party/libaddressinput/chromium/input_suggester.h b/third_party/libaddressinput/chromium/input_suggester.h index b361057..9d5fbcd 100644 --- a/third_party/libaddressinput/chromium/input_suggester.h +++ b/third_party/libaddressinput/chromium/input_suggester.h
@@ -5,11 +5,13 @@ #ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_INPUT_SUGGESTER_H_ #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_INPUT_SUGGESTER_H_ +#include <stddef.h> #include <stdint.h> + #include <map> #include <vector> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/icu/source/i18n/unicode/coll.h" #include "third_party/libaddressinput/src/cpp/include/libaddressinput/address_field.h"
diff --git a/third_party/libaddressinput/chromium/json.cc b/third_party/libaddressinput/chromium/json.cc index f1ff88e7..b7a7293 100644 --- a/third_party/libaddressinput/chromium/json.cc +++ b/third_party/libaddressinput/chromium/json.cc
@@ -7,9 +7,9 @@ #include <map> #include <utility> -#include "base/basictypes.h" #include "base/json/json_reader.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/stl_util.h" #include "base/values.h" @@ -36,7 +36,7 @@ else result.reset(static_cast<const base::DictionaryValue*>(parsed.release())); - return result.Pass(); + return std::move(result); } } // namespace
diff --git a/third_party/libaddressinput/chromium/override/basictypes_override.h b/third_party/libaddressinput/chromium/override/basictypes_override.h index 1a8274f..651f506 100644 --- a/third_party/libaddressinput/chromium/override/basictypes_override.h +++ b/third_party/libaddressinput/chromium/override/basictypes_override.h
@@ -5,8 +5,26 @@ #ifndef THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_ #define THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_ -#include "base/basictypes.h" +#include <limits.h> +#include <stddef.h> +#include <stdint.h> + +#include "base/macros.h" + +// There is no more base/basictypes.h in Chromium. Even though libaddressinput +// has its own "basictypes.h" that defines a whole host of custom integers of +// specific lengths, the only one actually used is |uint32| in util/md5.cc. So +// here you go: + +typedef uint32_t uint32; + +// TODO: Switch libaddressinput to |uint32_t|. + +// Also, Chromium uses the C++11 |static_assert|, so here's a definition for the +// old COMPILE_ASSERT: #define COMPILE_ASSERT(expr, msg) static_assert(expr, #msg) +// TODO: Switch libaddressinput to |static_assert|. + #endif // THIRD_PARTY_LIBADDRESSINPUT_CHROMIUM_BASICTYPES_OVERRIDE_H_
diff --git a/third_party/libaddressinput/chromium/storage_test_runner.h b/third_party/libaddressinput/chromium/storage_test_runner.h index 113587d..afbb885 100644 --- a/third_party/libaddressinput/chromium/storage_test_runner.h +++ b/third_party/libaddressinput/chromium/storage_test_runner.h
@@ -9,7 +9,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" namespace autofill {
diff --git a/third_party/libaddressinput/chromium/string_compare.cc b/third_party/libaddressinput/chromium/string_compare.cc index 9d247eb8..8996cd8 100644 --- a/third_party/libaddressinput/chromium/string_compare.cc +++ b/third_party/libaddressinput/chromium/string_compare.cc
@@ -4,9 +4,9 @@ #include "third_party/libaddressinput/src/cpp/src/util/string_compare.h" -#include "base/basictypes.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "third_party/icu/source/i18n/unicode/coll.h"
diff --git a/third_party/libaddressinput/chromium/trie.cc b/third_party/libaddressinput/chromium/trie.cc index e9289af..ccaf46e 100644 --- a/third_party/libaddressinput/chromium/trie.cc +++ b/third_party/libaddressinput/chromium/trie.cc
@@ -4,6 +4,8 @@ #include "third_party/libaddressinput/chromium/trie.h" +#include <stddef.h> + #include <queue> #include <string>
diff --git a/third_party/liblouis/nacl_wrapper/liblouis_instance.cc b/third_party/liblouis/nacl_wrapper/liblouis_instance.cc index 9e970d4..c771bc9 100644 --- a/third_party/liblouis/nacl_wrapper/liblouis_instance.cc +++ b/third_party/liblouis/nacl_wrapper/liblouis_instance.cc
@@ -14,9 +14,11 @@ #include "liblouis_instance.h" +#include <stddef.h> +#include <sys/mount.h> + #include <cstdio> #include <cstring> -#include <sys/mount.h> #include <vector> #include "native_client_sdk/src/libraries/nacl_io/nacl_io.h"
diff --git a/third_party/liblouis/nacl_wrapper/liblouis_instance.h b/third_party/liblouis/nacl_wrapper/liblouis_instance.h index 4731d62..68e4dcd 100644 --- a/third_party/liblouis/nacl_wrapper/liblouis_instance.h +++ b/third_party/liblouis/nacl_wrapper/liblouis_instance.h
@@ -15,9 +15,11 @@ #ifndef LIBLOUIS_NACL_LIBLOUIS_INSTANCE_H_ #define LIBLOUIS_NACL_LIBLOUIS_INSTANCE_H_ +#include <stdint.h> + #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "liblouis_wrapper.h" #include "ppapi/c/pp_instance.h" #include "ppapi/cpp/completion_callback.h"
diff --git a/third_party/liblouis/nacl_wrapper/liblouis_module.h b/third_party/liblouis/nacl_wrapper/liblouis_module.h index 09d2493f..77a25dd 100644 --- a/third_party/liblouis/nacl_wrapper/liblouis_module.h +++ b/third_party/liblouis/nacl_wrapper/liblouis_module.h
@@ -15,7 +15,7 @@ #ifndef LIBLOUIS_NACL_LIBLOUIS_MODULE_H_ #define LIBLOUIS_NACL_LIBLOUIS_MODULE_H_ -#include "base/basictypes.h" +#include "base/macros.h" #include "ppapi/c/pp_instance.h" #include "ppapi/cpp/instance.h" #include "ppapi/cpp/module.h"
diff --git a/third_party/liblouis/nacl_wrapper/liblouis_wrapper.h b/third_party/liblouis/nacl_wrapper/liblouis_wrapper.h index 46c48163..7f983f88 100644 --- a/third_party/liblouis/nacl_wrapper/liblouis_wrapper.h +++ b/third_party/liblouis/nacl_wrapper/liblouis_wrapper.h
@@ -17,7 +17,7 @@ #include <string> -#include "base/basictypes.h" +#include "base/macros.h" #include "translation_params.h" #include "translation_result.h"
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder.cc b/third_party/mojo/src/mojo/edk/embedder/embedder.cc index 15eb984..f55291e 100644 --- a/third_party/mojo/src/mojo/edk/embedder/embedder.cc +++ b/third_party/mojo/src/mojo/edk/embedder/embedder.cc
@@ -119,17 +119,17 @@ } ScopedPlatformHandle ChildProcessLaunched(base::ProcessHandle child_process) { - return CreateHandle(edk::ChildProcessLaunched(child_process).Pass()); + return CreateHandle(edk::ChildProcessLaunched(child_process)); } void ChildProcessLaunched(base::ProcessHandle child_process, ScopedPlatformHandle server_pipe) { - return edk::ChildProcessLaunched( - child_process, CreateEDKHandle(server_pipe.Pass())); + return edk::ChildProcessLaunched(child_process, + CreateEDKHandle(std::move(server_pipe))); } void SetParentPipeHandle(ScopedPlatformHandle pipe) { - edk::SetParentPipeHandle(CreateEDKHandle(pipe.Pass())); + edk::SetParentPipeHandle(CreateEDKHandle(std::move(pipe))); } void SetMaxMessageSize(size_t bytes) { @@ -162,12 +162,12 @@ DCHECK(platform_handle_wrapper_handle); if (UseNewEDK()) { return mojo::edk::CreatePlatformHandleWrapper( - CreateEDKHandle(platform_handle.Pass()), + CreateEDKHandle(std::move(platform_handle)), platform_handle_wrapper_handle); } scoped_refptr<system::Dispatcher> dispatcher = - system::PlatformHandleDispatcher::Create(platform_handle.Pass()); + system::PlatformHandleDispatcher::Create(std::move(platform_handle)); DCHECK(internal::g_core); MojoHandle h = internal::g_core->AddDispatcher(dispatcher); @@ -204,8 +204,7 @@ *platform_handle = static_cast<system::PlatformHandleDispatcher*>(dispatcher.get()) - ->PassPlatformHandle() - .Pass(); + ->PassPlatformHandle(); return MOJO_RESULT_OK; } @@ -220,7 +219,7 @@ internal::g_ipc_support = new system::IPCSupport( internal::g_platform_support, process_type, process_delegate, - io_thread_task_runner, platform_handle.Pass()); + io_thread_task_runner, std::move(platform_handle)); // TODO(use_chrome_edk) at this point the command line to switch to the new // EDK might not be set yet. There's no harm in always intializing the new EDK @@ -278,7 +277,7 @@ system::ChannelId channel_id = system::kInvalidChannelId; scoped_refptr<system::MessagePipeDispatcher> dispatcher = internal::g_ipc_support->ConnectToSlave( - connection_id, slave_info, platform_handle.Pass(), + connection_id, slave_info, std::move(platform_handle), did_connect_to_slave_callback, std::move(did_connect_to_slave_runner), &channel_id); *channel_info = new ChannelInfo(channel_id); @@ -288,7 +287,7 @@ CHECK(rv.is_valid()); // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it // once that's fixed. - return rv.Pass(); + return rv; } ScopedMessagePipeHandle ConnectToMaster( @@ -316,7 +315,7 @@ CHECK(rv.is_valid()); // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it // once that's fixed. - return rv.Pass(); + return rv; } // TODO(vtl): Write tests for this. @@ -333,14 +332,14 @@ *channel_info = new ChannelInfo(MakeChannelId()); scoped_refptr<system::MessagePipeDispatcher> dispatcher = channel_manager->CreateChannelOnIOThread((*channel_info)->channel_id, - platform_handle.Pass()); + std::move(platform_handle)); ScopedMessagePipeHandle rv( MessagePipeHandle(internal::g_core->AddDispatcher(dispatcher))); CHECK(rv.is_valid()); // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it // once that's fixed. - return rv.Pass(); + return rv; } ScopedMessagePipeHandle CreateChannel( @@ -355,7 +354,7 @@ if (!did_create_channel_callback.is_null()) did_create_channel_callback.Run(nullptr); return mojo::edk::CreateMessagePipe( - CreateEDKHandle(platform_handle.Pass())); + CreateEDKHandle(std::move(platform_handle))); } system::ChannelManager* channel_manager = @@ -365,7 +364,7 @@ scoped_ptr<ChannelInfo> channel_info(new ChannelInfo(channel_id)); scoped_refptr<system::MessagePipeDispatcher> dispatcher = channel_manager->CreateChannel( - channel_id, platform_handle.Pass(), + channel_id, std::move(platform_handle), base::Bind(did_create_channel_callback, base::Unretained(channel_info.release())), did_create_channel_runner); @@ -375,7 +374,7 @@ CHECK(rv.is_valid()); // TODO(vtl): The |.Pass()| below is only needed due to an MSVS bug; remove it // once that's fixed. - return rv.Pass(); + return rv; } // TODO(vtl): Write tests for this.
diff --git a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc index 7247281..fe93b51 100644 --- a/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc +++ b/third_party/mojo/src/mojo/edk/embedder/embedder_unittest.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/embedder/embedder.h" #include <string.h> +#include <utility> #include "base/bind.h" #include "base/command_line.h" @@ -55,7 +56,7 @@ channel_info_(nullptr), wait_on_shutdown_(true) { bootstrap_message_pipe_ = - CreateChannel(platform_handle.Pass(), + CreateChannel(std::move(platform_handle), base::Bind(&ScopedTestChannel::DidCreateChannel, base::Unretained(this)), nullptr) @@ -265,7 +266,7 @@ test_io_task_runner()->PostTask( FROM_HERE, - base::Bind(&CloseScopedHandle, base::Passed(server_mp.Pass()))); + base::Bind(&CloseScopedHandle, base::Passed(std::move(server_mp)))); EXPECT_TRUE(unsatisfiable_waiter.TryWait()); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, @@ -408,7 +409,7 @@ base::WaitableEvent event(true, false); ChannelInfo* channel_info = nullptr; ScopedMessagePipeHandle mp = ConnectToSlave( - nullptr, multiprocess_test_helper.server_platform_handle.Pass(), + nullptr, std::move(multiprocess_test_helper.server_platform_handle), base::Bind(&base::WaitableEvent::Signal, base::Unretained(&event)), nullptr, &connection_id, &channel_info); ASSERT_TRUE(mp.is_valid()); @@ -497,7 +498,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessMasterSlave) { base::MessageLoop message_loop; ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); EXPECT_TRUE(client_platform_handle.is_valid()); base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); @@ -505,7 +506,7 @@ { mojo::test::ScopedSlaveIPCSupport ipc_support( - test_io_thread.task_runner(), client_platform_handle.Pass()); + test_io_thread.task_runner(), std::move(client_platform_handle)); const base::CommandLine& command_line = *base::CommandLine::ForCurrentProcess(); @@ -582,7 +583,7 @@ { ScopedTestChannel server_channel( - multiprocess_test_helper.server_platform_handle.Pass()); + std::move(multiprocess_test_helper.server_platform_handle)); MojoHandle server_mp = server_channel.bootstrap_message_pipe(); EXPECT_NE(server_mp, MOJO_HANDLE_INVALID); server_channel.WaitForChannelCreationCompletion(); @@ -693,7 +694,7 @@ MOJO_MULTIPROCESS_TEST_CHILD_TEST(MultiprocessChannelsClient) { base::MessageLoop message_loop; ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); EXPECT_TRUE(client_platform_handle.is_valid()); base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); @@ -704,7 +705,7 @@ // probably. mojo::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); - ScopedTestChannel client_channel(client_platform_handle.Pass()); + ScopedTestChannel client_channel(std::move(client_platform_handle)); MojoHandle client_mp = client_channel.bootstrap_message_pipe(); EXPECT_NE(client_mp, MOJO_HANDLE_INVALID); client_channel.WaitForChannelCreationCompletion();
diff --git a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc index b9cb592..5689dae 100644 --- a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc +++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" +#include <utility> + #include "base/logging.h" namespace mojo { @@ -16,11 +18,11 @@ } ScopedPlatformHandle PlatformChannelPair::PassServerHandle() { - return server_handle_.Pass(); + return std::move(server_handle_); } ScopedPlatformHandle PlatformChannelPair::PassClientHandle() { - return client_handle_.Pass(); + return std::move(client_handle_); } void PlatformChannelPair::ChildProcessLaunched() {
diff --git a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc index 4927b4b8..3bd3f4fa 100644 --- a/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc +++ b/third_party/mojo/src/mojo/edk/embedder/platform_channel_pair_posix_unittest.cc
@@ -12,8 +12,8 @@ #include <sys/types.h> #include <sys/uio.h> #include <unistd.h> - #include <deque> +#include <utility> #include "base/files/scoped_file.h" #include "base/logging.h" @@ -83,8 +83,8 @@ TEST_F(PlatformChannelPairPosixTest, NoSigPipe) { PlatformChannelPair channel_pair; - ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass(); - ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass(); + ScopedPlatformHandle server_handle = channel_pair.PassServerHandle(); + ScopedPlatformHandle client_handle = channel_pair.PassClientHandle(); // Write to the client. static const char kHello[] = "hello"; @@ -124,8 +124,8 @@ TEST_F(PlatformChannelPairPosixTest, SendReceiveData) { PlatformChannelPair channel_pair; - ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass(); - ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass(); + ScopedPlatformHandle server_handle = channel_pair.PassServerHandle(); + ScopedPlatformHandle client_handle = channel_pair.PassClientHandle(); for (size_t i = 0; i < 10; i++) { std::string send_string(1 << i, 'A' + i); @@ -150,8 +150,8 @@ static const char kHello[] = "hello"; PlatformChannelPair channel_pair; - ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass(); - ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass(); + ScopedPlatformHandle server_handle = channel_pair.PassServerHandle(); + ScopedPlatformHandle client_handle = channel_pair.PassClientHandle(); // Reduce the number of FDs opened on OS X to avoid test flake. #if defined(OS_MACOSX) @@ -170,7 +170,7 @@ ASSERT_TRUE(fp); ASSERT_EQ(j, fwrite(std::string(j, c).data(), 1, j, fp.get())); platform_handles->push_back( - test::PlatformHandleFromFILE(fp.Pass()).release()); + test::PlatformHandleFromFILE(std::move(fp)).release()); ASSERT_TRUE(platform_handles->back().is_valid()); } @@ -211,8 +211,8 @@ static const char kHello[] = "hello"; PlatformChannelPair channel_pair; - ScopedPlatformHandle server_handle = channel_pair.PassServerHandle().Pass(); - ScopedPlatformHandle client_handle = channel_pair.PassClientHandle().Pass(); + ScopedPlatformHandle server_handle = channel_pair.PassServerHandle(); + ScopedPlatformHandle client_handle = channel_pair.PassClientHandle(); const std::string file_contents("hello world"); @@ -223,7 +223,7 @@ fwrite(file_contents.data(), 1, file_contents.size(), fp.get())); ScopedPlatformHandleVectorPtr platform_handles(new PlatformHandleVector); platform_handles->push_back( - test::PlatformHandleFromFILE(fp.Pass()).release()); + test::PlatformHandleFromFILE(std::move(fp)).release()); ASSERT_TRUE(platform_handles->back().is_valid()); // Send the FD (+ "hello").
diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc index 24c1472..a1dca82 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h" +#include <utility> + #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_handle_utils.h" @@ -34,7 +36,7 @@ DCHECK_GT(num_bytes, 0u); SimplePlatformSharedBuffer* rv = new SimplePlatformSharedBuffer(num_bytes); - if (!rv->InitFromPlatformHandle(platform_handle.Pass())) { + if (!rv->InitFromPlatformHandle(std::move(platform_handle))) { // We can't just delete it directly, due to the "in destructor" (debug) // check. scoped_refptr<SimplePlatformSharedBuffer> deleter(rv); @@ -82,7 +84,7 @@ ScopedPlatformHandle SimplePlatformSharedBuffer::PassPlatformHandle() { DCHECK(HasOneRef()); - return handle_.Pass(); + return std::move(handle_); } SimplePlatformSharedBuffer::SimplePlatformSharedBuffer(size_t num_bytes)
diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc index df99205..1047f55 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_posix.cc
@@ -10,8 +10,8 @@ #include <sys/stat.h> #include <sys/types.h> // For |off_t|. #include <unistd.h> - #include <limits> +#include <utility> #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -114,7 +114,7 @@ // TODO(vtl): More checks? - handle_ = platform_handle.Pass(); + handle_ = std::move(platform_handle); return true; }
diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc index 8fc1cf41..dc15dfa 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer_unittest.cc
@@ -171,8 +171,8 @@ { scoped_refptr<SimplePlatformSharedBuffer> buffer( SimplePlatformSharedBuffer::Create(100)); - mapping1 = buffer->Map(0, 100).Pass(); - mapping2 = buffer->Map(50, 50).Pass(); + mapping1 = buffer->Map(0, 100); + mapping2 = buffer->Map(50, 50); static_cast<char*>(mapping1->GetBase())[50] = 'x'; }
diff --git a/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc index 7a83783..3beb7b6 100644 --- a/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc +++ b/third_party/mojo/src/mojo/edk/embedder/simple_platform_support.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_support.h" +#include <utility> + #include "base/rand_util.h" #include "third_party/mojo/src/mojo/edk/embedder/simple_platform_shared_buffer.h" @@ -24,7 +26,7 @@ size_t num_bytes, ScopedPlatformHandle platform_handle) { return SimplePlatformSharedBuffer::CreateFromPlatformHandle( - num_bytes, platform_handle.Pass()); + num_bytes, std::move(platform_handle)); } } // namespace embedder
diff --git a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc index 2c213fe..a3cc2af 100644 --- a/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc +++ b/third_party/mojo/src/mojo/edk/js/tests/js_to_cpp_tests.cc
@@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <utility> + #include "base/at_exit.h" #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -98,8 +100,8 @@ string_array[0] = "one"; string_array[1] = "two"; string_array[2] = "three"; - args->string_array = string_array.Pass(); - return args.Pass(); + args->string_array = std::move(string_array); + return args; } void CheckSampleEchoArgs(const js_to_cpp::EchoArgs& arg) { @@ -208,7 +210,7 @@ js_to_cpp::JsSide* js_side() { return js_side_; } void Bind(InterfaceRequest<js_to_cpp::CppSide> request) { - binding_.Bind(request.Pass()); + binding_.Bind(std::move(request)); // Keep the pipe open even after validation errors. binding_.EnableTestingMode(); } @@ -378,7 +380,7 @@ js_to_cpp::CppSidePtr cpp_side_ptr; cpp_side->Bind(GetProxy(&cpp_side_ptr)); - js_side->SetCppSide(cpp_side_ptr.Pass()); + js_side->SetCppSide(std::move(cpp_side_ptr)); gin::IsolateHolder::Initialize(gin::IsolateHolder::kStrictMode, gin::IsolateHolder::kStableV8Extras,
diff --git a/third_party/mojo/src/mojo/edk/system/channel.cc b/third_party/mojo/src/mojo/edk/system/channel.cc index 0b3e9f85..d50da13 100644 --- a/third_party/mojo/src/mojo/edk/system/channel.cc +++ b/third_party/mojo/src/mojo/edk/system/channel.cc
@@ -43,7 +43,7 @@ // No need to take |mutex_|, since this must be called before this object // becomes thread-safe. DCHECK(!is_running_); - raw_channel_ = raw_channel.Pass(); + raw_channel_ = std::move(raw_channel); raw_channel_->Init(this); is_running_ = true; } @@ -162,7 +162,7 @@ } DVLOG_IF(2, is_shutting_down_) << "WriteMessage() while shutting down"; - return raw_channel_->WriteMessage(message.Pass()); + return raw_channel_->WriteMessage(std::move(message)); } bool Channel::IsWriteBufferEmpty() { @@ -316,10 +316,10 @@ switch (message_view.type()) { case MessageInTransit::Type::ENDPOINT_CLIENT: case MessageInTransit::Type::ENDPOINT: - OnReadMessageForEndpoint(message_view, platform_handles.Pass()); + OnReadMessageForEndpoint(message_view, std::move(platform_handles)); break; case MessageInTransit::Type::CHANNEL: - OnReadMessageForChannel(message_view, platform_handles.Pass()); + OnReadMessageForChannel(message_view, std::move(platform_handles)); break; default: HandleRemoteError( @@ -416,11 +416,11 @@ DCHECK(message_view.transport_data_buffer()); message->SetDispatchers(TransportData::DeserializeDispatchers( message_view.transport_data_buffer(), - message_view.transport_data_buffer_size(), platform_handles.Pass(), + message_view.transport_data_buffer_size(), std::move(platform_handles), this)); } - endpoint->OnReadMessage(message.Pass()); + endpoint->OnReadMessage(std::move(message)); } void Channel::OnReadMessageForChannel( @@ -668,7 +668,7 @@ MessageInTransit::Type::CHANNEL, subtype, 0, nullptr)); message->set_source_id(local_id); message->set_destination_id(remote_id); - return WriteMessage(message.Pass()); + return WriteMessage(std::move(message)); } } // namespace system
diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc index e330b38..7850421 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" +#include <utility> + #include "base/logging.h" #include "base/threading/platform_thread.h" #include "mojo/public/cpp/system/macros.h" @@ -33,10 +35,10 @@ switch (state_) { case State::PAUSED: - channel_message_queue_.AddMessage(message.Pass()); + channel_message_queue_.AddMessage(std::move(message)); return true; case State::RUNNING: - return WriteMessageNoLock(message.Pass()); + return WriteMessageNoLock(std::move(message)); case State::DEAD: return false; } @@ -98,7 +100,7 @@ void ChannelEndpoint::OnReadMessage(scoped_ptr<MessageInTransit> message) { if (message->type() == MessageInTransit::Type::ENDPOINT_CLIENT) { - OnReadMessageForClient(message.Pass()); + OnReadMessageForClient(std::move(message)); return; } @@ -160,7 +162,7 @@ message->SerializeAndCloseDispatchers(channel_); message->set_source_id(local_id_); message->set_destination_id(remote_id_); - return channel_->WriteMessage(message.Pass()); + return channel_->WriteMessage(std::move(message)); } void ChannelEndpoint::OnReadMessageForClient(
diff --git a/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc b/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc index 659b9b7..4782b62 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_endpoint_unittest.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" +#include <utility> + #include "base/synchronization/waitable_event.h" #include "base/test/test_timeouts.h" #include "mojo/public/cpp/system/macros.h" @@ -72,7 +74,7 @@ EXPECT_FALSE(read_event.IsSignaled()); // Send it through channel/endpoint 1. - EXPECT_TRUE(endpoint1->EnqueueMessage(send_message.Pass())); + EXPECT_TRUE(endpoint1->EnqueueMessage(std::move(send_message))); // Wait to receive it. EXPECT_TRUE(read_event.TimedWait(TestTimeouts::tiny_timeout()));
diff --git a/third_party/mojo/src/mojo/edk/system/channel_manager.cc b/third_party/mojo/src/mojo/edk/system/channel_manager.cc index bf70b02..49aeaf7 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_manager.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_manager.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/channel_manager.h" +#include <utility> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" @@ -70,7 +72,7 @@ scoped_refptr<system::MessagePipeDispatcher> dispatcher = system::MessagePipeDispatcher::CreateRemoteMessagePipe( &bootstrap_channel_endpoint); - CreateChannelOnIOThreadHelper(channel_id, platform_handle.Pass(), + CreateChannelOnIOThreadHelper(channel_id, std::move(platform_handle), bootstrap_channel_endpoint); return dispatcher; } @@ -78,7 +80,7 @@ scoped_refptr<Channel> ChannelManager::CreateChannelWithoutBootstrapOnIOThread( ChannelId channel_id, embedder::ScopedPlatformHandle platform_handle) { - return CreateChannelOnIOThreadHelper(channel_id, platform_handle.Pass(), + return CreateChannelOnIOThreadHelper(channel_id, std::move(platform_handle), nullptr); } @@ -174,7 +176,7 @@ // Create and initialize a |system::Channel|. scoped_refptr<system::Channel> channel = new system::Channel(platform_support_); - channel->Init(system::RawChannel::Create(platform_handle.Pass())); + channel->Init(system::RawChannel::Create(std::move(platform_handle))); if (bootstrap_channel_endpoint) channel->SetBootstrapEndpoint(bootstrap_channel_endpoint); @@ -201,7 +203,7 @@ // uses of ChannelManager. CHECK(channel_manager); channel_manager->CreateChannelOnIOThreadHelper( - channel_id, platform_handle.Pass(), bootstrap_channel_endpoint); + channel_id, std::move(platform_handle), bootstrap_channel_endpoint); if (callback_thread_task_runner) { bool ok = callback_thread_task_runner->PostTask(FROM_HERE, callback); DCHECK(ok);
diff --git a/third_party/mojo/src/mojo/edk/system/channel_test_base.cc b/third_party/mojo/src/mojo/edk/system/channel_test_base.cc index b02e46e..bfe429d 100644 --- a/third_party/mojo/src/mojo/edk/system/channel_test_base.cc +++ b/third_party/mojo/src/mojo/edk/system/channel_test_base.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/channel_test_base.h" +#include <utility> + #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" @@ -36,7 +38,7 @@ CHECK(raw_channels_[i]); CHECK(channels_[i]); - channels_[i]->Init(raw_channels_[i].Pass()); + channels_[i]->Init(std::move(raw_channels_[i])); } void ChannelTestBase::CreateAndInitChannelOnIOThread(unsigned i) {
diff --git a/third_party/mojo/src/mojo/edk/system/core.cc b/third_party/mojo/src/mojo/edk/system/core.cc index a11798f7..b7f875e 100644 --- a/third_party/mojo/src/mojo/edk/system/core.cc +++ b/third_party/mojo/src/mojo/edk/system/core.cc
@@ -608,7 +608,7 @@ void* address = mapping->GetBase(); { MutexLocker locker(&mapping_table_mutex_); - result = mapping_table_.AddMapping(mapping.Pass()); + result = mapping_table_.AddMapping(std::move(mapping)); } if (result != MOJO_RESULT_OK) return result;
diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe.cc b/third_party/mojo/src/mojo/edk/system/data_pipe.cc index a49e677..7ed7e7c92 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe.cc +++ b/third_party/mojo/src/mojo/edk/system/data_pipe.cc
@@ -5,9 +5,9 @@ #include "third_party/mojo/src/mojo/edk/system/data_pipe.h" #include <string.h> - #include <algorithm> #include <limits> +#include <utility> #include "base/logging.h" #include "base/memory/aligned_memory.h" @@ -115,10 +115,10 @@ // ongoing call to |IncomingEndpoint::OnReadMessage()| return false. This will // make |ChannelEndpoint::OnReadMessage()| retry, until its |ReplaceClient()| // is called. - DataPipe* data_pipe = - new DataPipe(false, true, validated_options, - make_scoped_ptr(new RemoteProducerDataPipeImpl( - channel_endpoint, buffer.Pass(), 0, buffer_num_bytes))); + DataPipe* data_pipe = new DataPipe( + false, true, validated_options, + make_scoped_ptr(new RemoteProducerDataPipeImpl( + channel_endpoint, std::move(buffer), 0, buffer_num_bytes))); if (channel_endpoint) { if (!channel_endpoint->ReplaceClient(data_pipe, 0)) data_pipe->OnDetachFromChannel(0); @@ -659,7 +659,7 @@ : nullptr), producer_two_phase_max_num_bytes_written_(0), consumer_two_phase_max_num_bytes_read_(0), - impl_(impl.Pass()) { + impl_(std::move(impl)) { impl_->set_owner(this); #if !defined(NDEBUG) || defined(DCHECK_ALWAYS_ON) @@ -683,10 +683,10 @@ DCHECK(new_impl); impl_->set_owner(nullptr); - scoped_ptr<DataPipeImpl> rv(impl_.Pass()); - impl_ = new_impl.Pass(); + scoped_ptr<DataPipeImpl> rv(std::move(impl_)); + impl_ = std::move(new_impl); impl_->set_owner(this); - return rv.Pass(); + return rv; } void DataPipe::SetProducerClosedNoLock() {
diff --git a/third_party/mojo/src/mojo/edk/system/data_pipe_impl.cc b/third_party/mojo/src/mojo/edk/system/data_pipe_impl.cc index 92b8fb3..c7b534c 100644 --- a/third_party/mojo/src/mojo/edk/system/data_pipe_impl.cc +++ b/third_party/mojo/src/mojo/edk/system/data_pipe_impl.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/data_pipe_impl.h" #include <algorithm> +#include <utility> #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -38,7 +39,7 @@ MessageInTransit::Type::ENDPOINT_CLIENT, MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA, static_cast<uint32_t>(message_num_bytes), buffer + *start_index)); - message_queue->AddMessage(message.Pass()); + message_queue->AddMessage(std::move(message)); DCHECK_LE(message_num_bytes, *current_num_bytes); *start_index += message_num_bytes;
diff --git a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc index d827459..382be15 100644 --- a/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc +++ b/third_party/mojo/src/mojo/edk/system/endpoint_relayer.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/endpoint_relayer.h" +#include <utility> + #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" @@ -32,7 +34,7 @@ void EndpointRelayer::SetFilter(scoped_ptr<Filter> filter) { MutexLocker locker(&mutex_); - filter_ = filter.Pass(); + filter_ = std::move(filter); } bool EndpointRelayer::OnReadMessage(unsigned port, MessageInTransit* message) {
diff --git a/third_party/mojo/src/mojo/edk/system/ipc_support.cc b/third_party/mojo/src/mojo/edk/system/ipc_support.cc index 1738578..26a5511 100644 --- a/third_party/mojo/src/mojo/edk/system/ipc_support.cc +++ b/third_party/mojo/src/mojo/edk/system/ipc_support.cc
@@ -49,7 +49,7 @@ static_cast<system::SlaveConnectionManager*>(connection_manager_.get()) ->Init( static_cast<embedder::SlaveProcessDelegate*>(process_delegate_), - platform_handle.Pass()); + std::move(platform_handle)); break; } @@ -96,10 +96,10 @@ "ChannelId and ProcessIdentifier types don't match"); embedder::ScopedPlatformHandle platform_connection_handle = - ConnectToSlaveInternal(connection_id, slave_info, platform_handle.Pass(), - channel_id); + ConnectToSlaveInternal(connection_id, slave_info, + std::move(platform_handle), channel_id); return channel_manager()->CreateChannel( - *channel_id, platform_connection_handle.Pass(), callback, + *channel_id, std::move(platform_connection_handle), callback, callback_thread_task_runner); } @@ -117,7 +117,7 @@ ConnectToMasterInternal(connection_id); *channel_id = kMasterProcessIdentifier; return channel_manager()->CreateChannel( - *channel_id, platform_connection_handle.Pass(), callback, + *channel_id, std::move(platform_connection_handle), callback, callback_thread_task_runner); } @@ -131,7 +131,7 @@ *slave_process_identifier = static_cast<system::MasterConnectionManager*>(connection_manager()) - ->AddSlaveAndBootstrap(slave_info, platform_handle.Pass(), + ->AddSlaveAndBootstrap(slave_info, std::move(platform_handle), connection_id); system::ProcessIdentifier peer_id = system::kInvalidProcessIdentifier;
diff --git a/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc b/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc index 4ebaafd..31a1ac5 100644 --- a/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/ipc_support_unittest.cc
@@ -204,7 +204,7 @@ } embedder::ScopedPlatformHandle PassSlavePlatformHandle() { - return slave_platform_handle_.Pass(); + return std::move(slave_platform_handle_); } const ConnectionIdentifier& connection_id() const { return connection_id_; } @@ -235,7 +235,7 @@ embedder::ProcessType::SLAVE, &slave_process_delegate_, test_io_thread->task_runner(), - platform_handle.Pass()), + std::move(platform_handle)), event_(true, false) {} ~TestSlave() {}
diff --git a/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.cc b/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.cc index c7bbc95..6dc9f82 100644 --- a/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.cc +++ b/third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.cc
@@ -11,8 +11,8 @@ #include "third_party/mojo/src/mojo/edk/system/local_data_pipe_impl.h" #include <string.h> - #include <algorithm> +#include <utility> #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -186,7 +186,7 @@ // Note: Keep |*this| alive until the end of this method, to make things // slightly easier on ourselves. scoped_ptr<DataPipeImpl> self(owner()->ReplaceImplNoLock(make_scoped_ptr( - new RemoteProducerDataPipeImpl(channel_endpoint.get(), buffer_.Pass(), + new RemoteProducerDataPipeImpl(channel_endpoint.get(), std::move(buffer_), start_index_, current_num_bytes_)))); *actual_size = sizeof(SerializedDataPipeProducerDispatcher) + @@ -364,7 +364,7 @@ // slightly easier on ourselves. scoped_ptr<DataPipeImpl> self(owner()->ReplaceImplNoLock(make_scoped_ptr( new RemoteConsumerDataPipeImpl(channel_endpoint.get(), old_num_bytes, - buffer_.Pass(), start_index_)))); + std::move(buffer_), start_index_)))); *actual_size = sizeof(SerializedDataPipeConsumerDispatcher) + channel->GetSerializedEndpointSize();
diff --git a/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc index ea2a6cf..c9614bc 100644 --- a/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc +++ b/third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/local_message_pipe_endpoint.h" #include <string.h> +#include <utility> #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/dispatcher.h" @@ -49,7 +50,7 @@ DCHECK(is_peer_open_); bool was_empty = message_queue_.IsEmpty(); - message_queue_.AddMessage(message.Pass()); + message_queue_.AddMessage(std::move(message)); if (was_empty) awakable_list_.AwakeForStateChange(GetHandleSignalsState()); }
diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc index b72e8ee..ced54ec0 100644 --- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc +++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/master_connection_manager.h" +#include <utility> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" @@ -101,8 +103,7 @@ : owner_(owner), process_identifier_(process_identifier), slave_info_(slave_info), - raw_channel_(RawChannel::Create(platform_handle.Pass())) { -} + raw_channel_(RawChannel::Create(std::move(platform_handle))) {} MasterConnectionManager::Helper::~Helper() { DCHECK(!raw_channel_); @@ -194,13 +195,13 @@ new embedder::PlatformHandleVector()); platform_handles->push_back(platform_handle.release()); response->SetTransportData(make_scoped_ptr( - new TransportData(platform_handles.Pass(), + new TransportData(std::move(platform_handles), raw_channel_->GetSerializedPlatformHandleSize()))); } else { DCHECK(!platform_handle.is_valid()); } - if (!raw_channel_->WriteMessage(response.Pass())) { + if (!raw_channel_->WriteMessage(std::move(response))) { LOG(ERROR) << "WriteMessage failed"; FatalError(); // WARNING: This destroys us. return; @@ -382,7 +383,7 @@ embedder::ScopedPlatformHandle platform_handle, const ConnectionIdentifier& connection_id) { ProcessIdentifier slave_process_identifier = - AddSlave(slave_info, platform_handle.Pass()); + AddSlave(slave_info, std::move(platform_handle)); MutexLocker locker(&mutex_); DCHECK(pending_connects_.find(connection_id) == pending_connects_.end()); @@ -671,7 +672,7 @@ AssertOnPrivateThread(); scoped_ptr<Helper> helper(new Helper(this, slave_process_identifier, - slave_info, platform_handle.Pass())); + slave_info, std::move(platform_handle))); helper->Init(); DCHECK(helpers_.find(slave_process_identifier) == helpers_.end());
diff --git a/third_party/mojo/src/mojo/edk/system/message_in_transit.cc b/third_party/mojo/src/mojo/edk/system/message_in_transit.cc index a40981d..000b993 100644 --- a/third_party/mojo/src/mojo/edk/system/message_in_transit.cc +++ b/third_party/mojo/src/mojo/edk/system/message_in_transit.cc
@@ -5,8 +5,8 @@ #include "third_party/mojo/src/mojo/edk/system/message_in_transit.h" #include <string.h> - #include <ostream> +#include <utility> #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/configuration.h" @@ -149,7 +149,7 @@ DCHECK(!dispatchers_); DCHECK(!transport_data_); - dispatchers_ = dispatchers.Pass(); + dispatchers_ = std::move(dispatchers); #ifndef NDEBUG for (size_t i = 0; i < dispatchers_->size(); i++) DCHECK(!(*dispatchers_)[i] || (*dispatchers_)[i]->HasOneRef()); @@ -162,7 +162,7 @@ DCHECK(!transport_data_); DCHECK(!dispatchers_); - transport_data_ = transport_data.Pass(); + transport_data_ = std::move(transport_data); UpdateTotalSize(); } @@ -173,7 +173,7 @@ if (!dispatchers_ || !dispatchers_->size()) return; - transport_data_.reset(new TransportData(dispatchers_.Pass(), channel)); + transport_data_.reset(new TransportData(std::move(dispatchers_), channel)); // Update the sizes in the message header. UpdateTotalSize();
diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe.cc b/third_party/mojo/src/mojo/edk/system/message_pipe.cc index 21b1040..19c1317 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe.cc +++ b/third_party/mojo/src/mojo/edk/system/message_pipe.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/message_pipe.h" +#include <utility> + #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" @@ -332,7 +334,7 @@ } // The endpoint's |EnqueueMessage()| may not report failure. - endpoints_[port]->EnqueueMessage(message.Pass()); + endpoints_[port]->EnqueueMessage(std::move(message)); return MOJO_RESULT_OK; } @@ -376,7 +378,7 @@ dispatchers->push_back(nullptr); } } - message->SetDispatchers(dispatchers.Pass()); + message->SetDispatchers(std::move(dispatchers)); return MOJO_RESULT_OK; }
diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc index 3d2b90c..dd3b777 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc
@@ -5,8 +5,8 @@ #include <stdint.h> #include <stdio.h> #include <string.h> - #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -95,11 +95,11 @@ embedder::SimplePlatformSupport platform_support; test::ChannelThread channel_thread(&platform_support); embedder::ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); CHECK(client_platform_handle.is_valid()); scoped_refptr<ChannelEndpoint> ep; scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep)); - channel_thread.Start(client_platform_handle.Pass(), ep); + channel_thread.Start(std::move(client_platform_handle), ep); std::string buffer(1000000, '\0'); int rv = 0;
diff --git a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc index a2781910..c2339e0 100644 --- a/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc +++ b/third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/message_pipe_test_utils.h" +#include <utility> + #include "base/bind.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" @@ -74,7 +76,7 @@ // Create and initialize |Channel|. channel_ = new Channel(platform_support_); - channel_->Init(RawChannel::Create(platform_handle.Pass())); + channel_->Init(RawChannel::Create(std::move(platform_handle))); // Start the bootstrap endpoint. // Note: On the "server" (parent process) side, we need not attach/run the @@ -100,7 +102,7 @@ } void MultiprocessMessagePipeTestBase::Init(scoped_refptr<ChannelEndpoint> ep) { - channel_thread_.Start(helper_.server_platform_handle.Pass(), ep); + channel_thread_.Start(std::move(helper_.server_platform_handle), ep); } #endif
diff --git a/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc index 93004623..08c4bdb7 100644 --- a/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/multiprocess_message_pipe_unittest.cc
@@ -5,8 +5,8 @@ #include <stdint.h> #include <stdio.h> #include <string.h> - #include <string> +#include <utility> #include <vector> #include "base/bind.h" @@ -45,11 +45,11 @@ embedder::SimplePlatformSupport platform_support; test::ChannelThread channel_thread(&platform_support); embedder::ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); CHECK(client_platform_handle.is_valid()); scoped_refptr<ChannelEndpoint> ep; scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep)); - channel_thread.Start(client_platform_handle.Pass(), ep); + channel_thread.Start(std::move(client_platform_handle), ep); const std::string quitquitquit("quitquitquit"); int rv = 0; @@ -208,11 +208,11 @@ embedder::SimplePlatformSupport platform_support; test::ChannelThread channel_thread(&platform_support); embedder::ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); CHECK(client_platform_handle.is_valid()); scoped_refptr<ChannelEndpoint> ep; scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep)); - channel_thread.Start(client_platform_handle.Pass(), ep); + channel_thread.Start(std::move(client_platform_handle), ep); // Wait for the first message from our parent. HandleSignalsState hss; @@ -390,11 +390,11 @@ embedder::SimplePlatformSupport platform_support; test::ChannelThread channel_thread(&platform_support); embedder::ScopedPlatformHandle client_platform_handle = - mojo::test::MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(mojo::test::MultiprocessTestHelper::client_platform_handle); CHECK(client_platform_handle.is_valid()); scoped_refptr<ChannelEndpoint> ep; scoped_refptr<MessagePipe> mp(MessagePipe::CreateLocalProxy(&ep)); - channel_thread.Start(client_platform_handle.Pass(), ep); + channel_thread.Start(std::move(client_platform_handle), ep); HandleSignalsState hss; CHECK_EQ(test::WaitIfNecessary(mp, MOJO_HANDLE_SIGNAL_READABLE, &hss), @@ -427,11 +427,11 @@ scoped_refptr<PlatformHandleDispatcher> dispatcher( static_cast<PlatformHandleDispatcher*>(dispatchers[i].get())); - embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle().Pass(); + embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle(); CHECK(h.is_valid()); dispatcher->Close(); - base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(h.Pass(), "r")); + base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(std::move(h), "r")); CHECK(fp); std::string fread_buffer(100, '\0'); size_t bytes_read = @@ -472,7 +472,7 @@ scoped_refptr<PlatformHandleDispatcher> dispatcher = PlatformHandleDispatcher::Create(embedder::ScopedPlatformHandle( - mojo::test::PlatformHandleFromFILE(fp.Pass()))); + mojo::test::PlatformHandleFromFILE(std::move(fp)))); dispatchers.push_back(dispatcher); DispatcherTransport transport( test::DispatcherTryStartTransport(dispatcher.get()));
diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc index c440ec0..5e3f639 100644 --- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc +++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h" #include <algorithm> +#include <utility> #include "base/logging.h" @@ -23,7 +24,7 @@ embedder::ScopedPlatformHandle PlatformHandleDispatcher::PassPlatformHandle() { MutexLocker locker(&mutex()); - return platform_handle_.Pass(); + return std::move(platform_handle_); } Dispatcher::Type PlatformHandleDispatcher::GetType() const { @@ -66,8 +67,7 @@ PlatformHandleDispatcher::PlatformHandleDispatcher( embedder::ScopedPlatformHandle platform_handle) - : platform_handle_(platform_handle.Pass()) { -} + : platform_handle_(std::move(platform_handle)) {} PlatformHandleDispatcher::~PlatformHandleDispatcher() { } @@ -80,7 +80,7 @@ scoped_refptr<Dispatcher> PlatformHandleDispatcher::CreateEquivalentDispatcherAndCloseImplNoLock() { mutex().AssertHeld(); - return Create(platform_handle_.Pass()); + return Create(std::move(platform_handle_)); } void PlatformHandleDispatcher::StartSerializeImplNoLock(
diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h index 0dde78c..2a2337d0 100644 --- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h +++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
@@ -5,6 +5,8 @@ #ifndef THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_ #define THIRD_PARTY_MOJO_SRC_MOJO_EDK_SYSTEM_PLATFORM_HANDLE_DISPATCHER_H_ +#include <utility> + #include "mojo/public/cpp/system/macros.h" #include "third_party/mojo/src/mojo/edk/embedder/scoped_platform_handle.h" #include "third_party/mojo/src/mojo/edk/system/simple_dispatcher.h" @@ -21,7 +23,7 @@ static scoped_refptr<PlatformHandleDispatcher> Create( embedder::ScopedPlatformHandle platform_handle) { return make_scoped_refptr( - new PlatformHandleDispatcher(platform_handle.Pass())); + new PlatformHandleDispatcher(std::move(platform_handle))); } embedder::ScopedPlatformHandle PassPlatformHandle();
diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc index 1f25adf..f52b0ed 100644 --- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher_unittest.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h" #include <stdio.h> +#include <utility> #include "base/files/file_path.h" #include "base/files/file_util.h" @@ -32,19 +33,19 @@ fwrite(kHelloWorld, 1, sizeof(kHelloWorld), fp.get())); embedder::ScopedPlatformHandle h( - mojo::test::PlatformHandleFromFILE(fp.Pass())); + mojo::test::PlatformHandleFromFILE(std::move(fp))); EXPECT_FALSE(fp); ASSERT_TRUE(h.is_valid()); scoped_refptr<PlatformHandleDispatcher> dispatcher = - PlatformHandleDispatcher::Create(h.Pass()); + PlatformHandleDispatcher::Create(std::move(h)); EXPECT_FALSE(h.is_valid()); EXPECT_EQ(Dispatcher::Type::PLATFORM_HANDLE, dispatcher->GetType()); - h = dispatcher->PassPlatformHandle().Pass(); + h = dispatcher->PassPlatformHandle(); EXPECT_TRUE(h.is_valid()); - fp = mojo::test::FILEFromPlatformHandle(h.Pass(), "rb").Pass(); + fp = mojo::test::FILEFromPlatformHandle(std::move(h), "rb"); EXPECT_FALSE(h.is_valid()); EXPECT_TRUE(fp); @@ -55,7 +56,7 @@ EXPECT_STREQ(kHelloWorld, read_buffer); // Try getting the handle again. (It should fail cleanly.) - h = dispatcher->PassPlatformHandle().Pass(); + h = dispatcher->PassPlatformHandle(); EXPECT_FALSE(h.is_valid()); EXPECT_EQ(MOJO_RESULT_OK, dispatcher->Close()); @@ -74,7 +75,7 @@ scoped_refptr<PlatformHandleDispatcher> dispatcher = PlatformHandleDispatcher::Create( - mojo::test::PlatformHandleFromFILE(fp.Pass())); + mojo::test::PlatformHandleFromFILE(std::move(fp))); DispatcherTransport transport( test::DispatcherTryStartTransport(dispatcher.get())); @@ -94,7 +95,7 @@ dispatcher = static_cast<PlatformHandleDispatcher*>(generic_dispatcher.get()); fp = mojo::test::FILEFromPlatformHandle(dispatcher->PassPlatformHandle(), - "rb").Pass(); + "rb"); EXPECT_TRUE(fp); rewind(fp.get());
diff --git a/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc index 33161ac..a648bfd 100644 --- a/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc +++ b/third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/proxy_message_pipe_endpoint.h" #include <string.h> +#include <utility> #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/channel_endpoint.h" @@ -46,7 +47,7 @@ void ProxyMessagePipeEndpoint::EnqueueMessage( scoped_ptr<MessageInTransit> message) { DCHECK(channel_endpoint_); - bool ok = channel_endpoint_->EnqueueMessage(message.Pass()); + bool ok = channel_endpoint_->EnqueueMessage(std::move(message)); LOG_IF(WARNING, !ok) << "Failed to write enqueue message to channel"; }
diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel.cc b/third_party/mojo/src/mojo/edk/system/raw_channel.cc index 1c76bab..3068dce9 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel.cc
@@ -5,8 +5,8 @@ #include "third_party/mojo/src/mojo/edk/system/raw_channel.h" #include <string.h> - #include <algorithm> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -217,7 +217,7 @@ write_stopped_ = true; weak_ptr_factory_.InvalidateWeakPtrs(); - OnShutdownNoLock(read_buffer_.Pass(), write_buffer_.Pass()); + OnShutdownNoLock(std::move(read_buffer_), std::move(write_buffer_)); } // Reminder: This must be thread-safe. @@ -229,11 +229,11 @@ return false; if (!write_buffer_->message_queue_.IsEmpty()) { - EnqueueMessageNoLock(message.Pass()); + EnqueueMessageNoLock(std::move(message)); return true; } - EnqueueMessageNoLock(message.Pass()); + EnqueueMessageNoLock(std::move(message)); DCHECK_EQ(write_buffer_->data_offset_, 0u); size_t platform_handles_written = 0; @@ -332,9 +332,8 @@ &platform_handle_table); if (num_platform_handles > 0) { - platform_handles = - GetReadPlatformHandles(num_platform_handles, - platform_handle_table).Pass(); + platform_handles = GetReadPlatformHandles(num_platform_handles, + platform_handle_table); if (!platform_handles) { LOG(ERROR) << "Invalid number of platform handles received"; CallOnError(Delegate::ERROR_READ_BAD_MESSAGE); @@ -353,7 +352,7 @@ DCHECK(!set_on_shutdown_); set_on_shutdown_ = &shutdown_called; DCHECK(delegate_); - delegate_->OnReadMessage(message_view, platform_handles.Pass()); + delegate_->OnReadMessage(message_view, std::move(platform_handles)); if (shutdown_called) return; set_on_shutdown_ = nullptr; @@ -432,7 +431,7 @@ void RawChannel::EnqueueMessageNoLock(scoped_ptr<MessageInTransit> message) { write_lock_.AssertAcquired(); - write_buffer_->message_queue_.AddMessage(message.Pass()); + write_buffer_->message_queue_.AddMessage(std::move(message)); } bool RawChannel::OnReadMessageForRawChannel(
diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc index c2be79f..789ab4c 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel_posix.cc
@@ -7,9 +7,9 @@ #include <errno.h> #include <sys/uio.h> #include <unistd.h> - #include <algorithm> #include <deque> +#include <utility> #include "base/bind.h" #include "base/location.h" @@ -91,7 +91,7 @@ }; RawChannelPosix::RawChannelPosix(embedder::ScopedPlatformHandle handle) - : fd_(handle.Pass()), + : fd_(std::move(handle)), pending_read_(false), pending_write_(false), weak_ptr_factory_(this) { @@ -142,9 +142,9 @@ platform_handles->begin() + i, platform_handles->begin() + i + embedder::kPlatformChannelMaxNumHandles)); - fd_message->SetTransportData(make_scoped_ptr( - new TransportData(fds.Pass(), GetSerializedPlatformHandleSize()))); - RawChannel::EnqueueMessageNoLock(fd_message.Pass()); + fd_message->SetTransportData(make_scoped_ptr(new TransportData( + std::move(fds), GetSerializedPlatformHandleSize()))); + RawChannel::EnqueueMessageNoLock(std::move(fd_message)); } // Remove the handles that we "moved" into the other messages. @@ -153,7 +153,7 @@ } } - RawChannel::EnqueueMessageNoLock(message.Pass()); + RawChannel::EnqueueMessageNoLock(std::move(message)); } bool RawChannelPosix::OnReadMessageForRawChannel( @@ -209,7 +209,7 @@ read_platform_handles_.erase( read_platform_handles_.begin(), read_platform_handles_.begin() + num_platform_handles); - return rv.Pass(); + return rv; } RawChannel::IOResult RawChannelPosix::WriteNoLock( @@ -472,7 +472,7 @@ // static scoped_ptr<RawChannel> RawChannel::Create( embedder::ScopedPlatformHandle handle) { - return make_scoped_ptr(new RawChannelPosix(handle.Pass())); + return make_scoped_ptr(new RawChannelPosix(std::move(handle))); } } // namespace system
diff --git a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc index 831d3848..1501eea 100644 --- a/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/raw_channel_unittest.cc
@@ -6,7 +6,7 @@ #include <stdint.h> #include <stdio.h> - +#include <utility> #include <vector> #include "base/bind.h" @@ -194,7 +194,7 @@ // Tests writing (and verifies reading using our own custom reader). TEST_F(RawChannelTest, WriteMessage) { WriteOnlyRawChannelDelegate delegate; - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); TestMessageReaderAndChecker checker(handles[1].get()); io_thread()->PostTaskAndWait( FROM_HERE, @@ -280,7 +280,7 @@ // Tests reading (writing using our own custom writer). TEST_F(RawChannelTest, OnReadMessage) { ReadCheckerRawChannelDelegate delegate; - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait( FROM_HERE, base::Bind(&InitOnIOThread, rc.get(), base::Unretained(&delegate))); @@ -377,14 +377,14 @@ static const size_t kNumWriteMessagesPerThread = 4000; WriteOnlyRawChannelDelegate writer_delegate; - scoped_ptr<RawChannel> writer_rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> writer_rc(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&InitOnIOThread, writer_rc.get(), base::Unretained(&writer_delegate))); ReadCountdownRawChannelDelegate reader_delegate(kNumWriterThreads * kNumWriteMessagesPerThread); - scoped_ptr<RawChannel> reader_rc(RawChannel::Create(handles[1].Pass())); + scoped_ptr<RawChannel> reader_rc(RawChannel::Create(std::move(handles[1]))); io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&InitOnIOThread, reader_rc.get(), base::Unretained(&reader_delegate))); @@ -474,7 +474,7 @@ // Tests (fatal) errors. TEST_F(RawChannelTest, OnError) { ErrorRecordingRawChannelDelegate delegate(0, true, true); - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait( FROM_HERE, base::Bind(&InitOnIOThread, rc.get(), base::Unretained(&delegate))); @@ -517,7 +517,7 @@ // Only start up reading here. The system buffer should still contain the // messages that were written. ErrorRecordingRawChannelDelegate delegate(kMessageCount, true, true); - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait( FROM_HERE, base::Bind(&InitOnIOThread, rc.get(), base::Unretained(&delegate))); @@ -543,7 +543,7 @@ // correctly. TEST_F(RawChannelTest, WriteMessageAfterShutdown) { WriteOnlyRawChannelDelegate delegate; - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait( FROM_HERE, base::Bind(&InitOnIOThread, rc.get(), base::Unretained(&delegate))); @@ -603,7 +603,7 @@ for (size_t count = 0; count < 5; count++) EXPECT_TRUE(WriteTestMessageToHandle(handles[1].get(), 10)); - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); ShutdownOnReadMessageRawChannelDelegate delegate(rc.get(), false); io_thread()->PostTaskAndWait( FROM_HERE, @@ -618,7 +618,7 @@ EXPECT_TRUE(WriteTestMessageToHandle(handles[1].get(), 10)); // The delegate will destroy |rc|. - RawChannel* rc = RawChannel::Create(handles[0].Pass()).release(); + RawChannel* rc = RawChannel::Create(std::move(handles[0])).release(); ShutdownOnReadMessageRawChannelDelegate delegate(rc, true); io_thread()->PostTaskAndWait( FROM_HERE, base::Bind(&InitOnIOThread, rc, base::Unretained(&delegate))); @@ -675,7 +675,7 @@ }; TEST_F(RawChannelTest, ShutdownOnErrorRead) { - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); ShutdownOnErrorRawChannelDelegate delegate( rc.get(), false, RawChannel::Delegate::ERROR_READ_SHUTDOWN); io_thread()->PostTaskAndWait( @@ -690,7 +690,7 @@ } TEST_F(RawChannelTest, ShutdownAndDestroyOnErrorRead) { - RawChannel* rc = RawChannel::Create(handles[0].Pass()).release(); + RawChannel* rc = RawChannel::Create(std::move(handles[0])).release(); ShutdownOnErrorRawChannelDelegate delegate( rc, true, RawChannel::Delegate::ERROR_READ_SHUTDOWN); io_thread()->PostTaskAndWait( @@ -704,7 +704,7 @@ } TEST_F(RawChannelTest, ShutdownOnErrorWrite) { - scoped_ptr<RawChannel> rc(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc(RawChannel::Create(std::move(handles[0]))); ShutdownOnErrorRawChannelDelegate delegate(rc.get(), false, RawChannel::Delegate::ERROR_WRITE); io_thread()->PostTaskAndWait( @@ -721,7 +721,7 @@ } TEST_F(RawChannelTest, ShutdownAndDestroyOnErrorWrite) { - RawChannel* rc = RawChannel::Create(handles[0].Pass()).release(); + RawChannel* rc = RawChannel::Create(std::move(handles[0])).release(); ShutdownOnErrorRawChannelDelegate delegate(rc, true, RawChannel::Delegate::ERROR_WRITE); io_thread()->PostTaskAndWait( @@ -764,7 +764,8 @@ { char buffer[100] = {}; - base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(h1.Pass(), "rb")); + base::ScopedFILE fp( + mojo::test::FILEFromPlatformHandle(std::move(h1), "rb")); EXPECT_TRUE(fp); rewind(fp.get()); EXPECT_EQ(1u, fread(buffer, 1, sizeof(buffer), fp.get())); @@ -773,7 +774,8 @@ { char buffer[100] = {}; - base::ScopedFILE fp(mojo::test::FILEFromPlatformHandle(h2.Pass(), "rb")); + base::ScopedFILE fp( + mojo::test::FILEFromPlatformHandle(std::move(h2), "rb")); EXPECT_TRUE(fp); rewind(fp.get()); EXPECT_EQ(1u, fread(buffer, 1, sizeof(buffer), fp.get())); @@ -806,13 +808,13 @@ ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); WriteOnlyRawChannelDelegate write_delegate; - scoped_ptr<RawChannel> rc_write(RawChannel::Create(handles[0].Pass())); + scoped_ptr<RawChannel> rc_write(RawChannel::Create(std::move(handles[0]))); io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&InitOnIOThread, rc_write.get(), base::Unretained(&write_delegate))); ReadPlatformHandlesCheckerRawChannelDelegate read_delegate; - scoped_ptr<RawChannel> rc_read(RawChannel::Create(handles[1].Pass())); + scoped_ptr<RawChannel> rc_read(RawChannel::Create(std::move(handles[1]))); io_thread()->PostTaskAndWait(FROM_HERE, base::Bind(&InitOnIOThread, rc_read.get(), base::Unretained(&read_delegate))); @@ -830,17 +832,18 @@ embedder::ScopedPlatformHandleVectorPtr platform_handles( new embedder::PlatformHandleVector()); platform_handles->push_back( - mojo::test::PlatformHandleFromFILE(fp1.Pass()).release()); + mojo::test::PlatformHandleFromFILE(std::move(fp1)).release()); platform_handles->push_back( - mojo::test::PlatformHandleFromFILE(fp2.Pass()).release()); + mojo::test::PlatformHandleFromFILE(std::move(fp2)).release()); scoped_ptr<MessageInTransit> message( new MessageInTransit(MessageInTransit::Type::ENDPOINT_CLIENT, MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA, sizeof(kHello), kHello)); - message->SetTransportData(make_scoped_ptr(new TransportData( - platform_handles.Pass(), rc_write->GetSerializedPlatformHandleSize()))); - EXPECT_TRUE(rc_write->WriteMessage(message.Pass())); + message->SetTransportData(make_scoped_ptr( + new TransportData(std::move(platform_handles), + rc_write->GetSerializedPlatformHandleSize()))); + EXPECT_TRUE(rc_write->WriteMessage(std::move(message))); } read_delegate.Wait();
diff --git a/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.cc b/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.cc index ba2a961..8cb48db 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.cc +++ b/third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.cc
@@ -5,8 +5,8 @@ #include "third_party/mojo/src/mojo/edk/system/remote_consumer_data_pipe_impl.h" #include <string.h> - #include <algorithm> +#include <utility> #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -73,7 +73,7 @@ size_t start_index) : channel_endpoint_(channel_endpoint), consumer_num_bytes_(consumer_num_bytes), - buffer_(buffer.Pass()), + buffer_(std::move(buffer)), start_index_(start_index) { // Note: |buffer_| may be null (in which case it'll be lazily allocated). } @@ -156,7 +156,7 @@ MessageInTransit::Type::ENDPOINT_CLIENT, MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA, static_cast<uint32_t>(message_num_bytes), elements.At(offset))); - if (!channel_endpoint_->EnqueueMessage(message.Pass())) { + if (!channel_endpoint_->EnqueueMessage(std::move(message))) { Disconnect(); break; } @@ -230,7 +230,7 @@ MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA, static_cast<uint32_t>(message_num_bytes), buffer_.get() + start_index_ + offset)); - if (!channel_endpoint_->EnqueueMessage(message.Pass())) { + if (!channel_endpoint_->EnqueueMessage(std::move(message))) { set_producer_two_phase_max_num_bytes_written(0); Disconnect(); return MOJO_RESULT_OK;
diff --git a/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc index 7e08429..ef25086 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc +++ b/third_party/mojo/src/mojo/edk/system/remote_message_pipe_unittest.cc
@@ -5,7 +5,7 @@ #include <stdint.h> #include <stdio.h> #include <string.h> - +#include <utility> #include <vector> #include "base/bind.h" @@ -17,7 +17,7 @@ #include "base/logging.h" #include "base/message_loop/message_loop.h" #include "base/test/test_io_thread.h" -#include "build/build_config.h" // TODO(vtl): Remove this. +#include "build/build_config.h" // TODO(vtl): Remove this. #include "mojo/public/cpp/system/macros.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/mojo/src/mojo/edk/embedder/platform_channel_pair.h" @@ -127,7 +127,7 @@ channels_[channel_index] = new Channel(&platform_support_); channels_[channel_index]->Init( - RawChannel::Create(platform_handles_[channel_index].Pass())); + RawChannel::Create(std::move(platform_handles_[channel_index]))); } void BootstrapChannelEndpointsOnIOThread(scoped_refptr<ChannelEndpoint> ep0, @@ -1047,7 +1047,7 @@ // be passed. scoped_refptr<PlatformHandleDispatcher> dispatcher = PlatformHandleDispatcher::Create( - mojo::test::PlatformHandleFromFILE(fp.Pass())); + mojo::test::PlatformHandleFromFILE(std::move(fp))); // Prepare to wait on MP 1, port 1. (Add the waiter now. Otherwise, if we do // it later, it might already be readable.) @@ -1106,10 +1106,10 @@ dispatcher = static_cast<PlatformHandleDispatcher*>(read_dispatchers[0].get()); - embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle().Pass(); + embedder::ScopedPlatformHandle h = dispatcher->PassPlatformHandle(); EXPECT_TRUE(h.is_valid()); - fp = mojo::test::FILEFromPlatformHandle(h.Pass(), "rb").Pass(); + fp = mojo::test::FILEFromPlatformHandle(std::move(h), "rb"); EXPECT_FALSE(h.is_valid()); EXPECT_TRUE(fp);
diff --git a/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.cc b/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.cc index ec878e1f..e47d6c13a 100644 --- a/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.cc +++ b/third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.cc
@@ -5,8 +5,8 @@ #include "third_party/mojo/src/mojo/edk/system/remote_producer_data_pipe_impl.h" #include <string.h> - #include <algorithm> +#include <utility> #include "base/logging.h" #include "base/memory/scoped_ptr.h" @@ -72,7 +72,7 @@ size_t start_index, size_t current_num_bytes) : channel_endpoint_(channel_endpoint), - buffer_(buffer.Pass()), + buffer_(std::move(buffer)), start_index_(start_index), current_num_bytes_(current_num_bytes) { DCHECK(buffer_ || !current_num_bytes); @@ -109,7 +109,7 @@ } } - *buffer = new_buffer.Pass(); + *buffer = std::move(new_buffer); *buffer_num_bytes = current_num_bytes; return true; } @@ -444,7 +444,7 @@ MessageInTransit::Type::ENDPOINT_CLIENT, MessageInTransit::Subtype::ENDPOINT_CLIENT_DATA_PIPE_ACK, static_cast<uint32_t>(sizeof(ack_data)), &ack_data)); - if (!channel_endpoint_->EnqueueMessage(message.Pass())) + if (!channel_endpoint_->EnqueueMessage(std::move(message))) Disconnect(); }
diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc index 373d9a32..0c85965a 100644 --- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc +++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/system/slave_connection_manager.h" +#include <utility> + #include "base/bind.h" #include "base/bind_helpers.h" #include "base/location.h" @@ -131,7 +133,7 @@ embedder::ScopedPlatformHandle platform_handle) { AssertOnPrivateThread(); - raw_channel_ = RawChannel::Create(platform_handle.Pass()); + raw_channel_ = RawChannel::Create(std::move(platform_handle)); raw_channel_->Init(this); event_.Signal(); }
diff --git a/third_party/mojo/src/mojo/edk/system/transport_data.cc b/third_party/mojo/src/mojo/edk/system/transport_data.cc index 9bcecc4..2605004d 100644 --- a/third_party/mojo/src/mojo/edk/system/transport_data.cc +++ b/third_party/mojo/src/mojo/edk/system/transport_data.cc
@@ -5,6 +5,7 @@ #include "third_party/mojo/src/mojo/edk/system/transport_data.h" #include <string.h> +#include <utility> #include "base/logging.h" #include "third_party/mojo/src/mojo/edk/system/channel.h" @@ -194,7 +195,7 @@ TransportData::TransportData( embedder::ScopedPlatformHandleVectorPtr platform_handles, size_t serialized_platform_handle_size) - : buffer_size_(), platform_handles_(platform_handles.Pass()) { + : buffer_size_(), platform_handles_(std::move(platform_handles)) { buffer_size_ = MessageInTransit::RoundUpMessageAlignment( sizeof(Header) + platform_handles_->size() * serialized_platform_handle_size); @@ -335,7 +336,7 @@ channel, handle_table[i].type, source, size, platform_handles.get()); } - return dispatchers.Pass(); + return dispatchers; } } // namespace system
diff --git a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc index eb110d1..07d07330 100644 --- a/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc +++ b/third_party/mojo/src/mojo/edk/test/multiprocess_test_helper_unittest.cc
@@ -4,6 +4,8 @@ #include "third_party/mojo/src/mojo/edk/test/multiprocess_test_helper.h" +#include <utility> + #include "base/logging.h" #include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" @@ -86,7 +88,8 @@ helper.StartChild("PassedChannel"); // Take ownership of the handle. - embedder::ScopedPlatformHandle handle = helper.server_platform_handle.Pass(); + embedder::ScopedPlatformHandle handle = + std::move(helper.server_platform_handle); // The handle should be non-blocking. EXPECT_TRUE(IsNonBlocking(handle.get())); @@ -109,7 +112,7 @@ // Take ownership of the handle. embedder::ScopedPlatformHandle handle = - MultiprocessTestHelper::client_platform_handle.Pass(); + std::move(MultiprocessTestHelper::client_platform_handle); // The handle should be non-blocking. EXPECT_TRUE(IsNonBlocking(handle.get()));
diff --git a/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc b/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc index 9fd5297..60845f1 100644 --- a/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc +++ b/third_party/mojo/src/mojo/edk/test/test_utils_posix.cc
@@ -84,7 +84,7 @@ CHECK(h.is_valid()); base::ScopedFILE rv(fdopen(h.release().fd, mode)); PCHECK(rv) << "fdopen"; - return rv.Pass(); + return rv; } } // namespace test
diff --git a/third_party/npapi/bindings/npapi.h b/third_party/npapi/bindings/npapi.h index 8d42450..97eb900 100644 --- a/third_party/npapi/bindings/npapi.h +++ b/third_party/npapi/bindings/npapi.h
@@ -48,12 +48,8 @@ #include "nptypes.h" #endif -#ifdef __native_client__ #include <stdint.h> #include <sys/types.h> -#else -#include "base/basictypes.h" -#endif /* __native_client__ */ /* END GOOGLE MODIFICATIONS */
diff --git a/third_party/zlib/google/DEPS b/third_party/zlib/google/DEPS index e616fe28..144fbd1 100644 --- a/third_party/zlib/google/DEPS +++ b/third_party/zlib/google/DEPS
@@ -1,4 +1,5 @@ include_rules = [ '+base', + '+build', '+testing', ]
diff --git a/third_party/zlib/google/zip.cc b/third_party/zlib/google/zip.cc index 39e2e53..f0180e5 100644 --- a/third_party/zlib/google/zip.cc +++ b/third_party/zlib/google/zip.cc
@@ -13,6 +13,7 @@ #include "base/logging.h" #include "base/strings/string16.h" #include "base/strings/string_util.h" +#include "build/build_config.h" #include "third_party/zlib/google/zip_internal.h" #include "third_party/zlib/google/zip_reader.h"
diff --git a/third_party/zlib/google/zip.h b/third_party/zlib/google/zip.h index 216b09e2..3d20e595 100644 --- a/third_party/zlib/google/zip.h +++ b/third_party/zlib/google/zip.h
@@ -9,6 +9,7 @@ #include "base/callback.h" #include "base/files/file_path.h" +#include "build/build_config.h" namespace zip {
diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc index 1f026c9..77f2b17 100644 --- a/third_party/zlib/google/zip_internal.cc +++ b/third_party/zlib/google/zip_internal.cc
@@ -4,12 +4,15 @@ #include "third_party/zlib/google/zip_internal.h" +#include <stddef.h> + #include <algorithm> #include "base/files/file_util.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" +#include "build/build_config.h" #if defined(USE_SYSTEM_MINIZIP) #include <minizip/ioapi.h>
diff --git a/third_party/zlib/google/zip_internal.h b/third_party/zlib/google/zip_internal.h index ffd4039..0ebf0c9 100644 --- a/third_party/zlib/google/zip_internal.h +++ b/third_party/zlib/google/zip_internal.h
@@ -5,12 +5,14 @@ #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_INTERNAL_H_ +#include <string> + +#include "build/build_config.h" + #if defined(OS_WIN) #include <windows.h> #endif -#include <string> - #if defined(USE_SYSTEM_MINIZIP) #include <minizip/unzip.h> #include <minizip/zip.h>
diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc index 83086a3..91d2ec3 100644 --- a/third_party/zlib/google/zip_reader.cc +++ b/third_party/zlib/google/zip_reader.cc
@@ -4,13 +4,17 @@ #include "third_party/zlib/google/zip_reader.h" +#include <utility> + #include "base/bind.h" #include "base/files/file.h" #include "base/logging.h" +#include "base/macros.h" #include "base/message_loop/message_loop.h" #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "build/build_config.h" #include "third_party/zlib/google/zip_internal.h" #if defined(USE_SYSTEM_MINIZIP) @@ -392,13 +396,9 @@ base::MessageLoop::current()->PostTask( FROM_HERE, - base::Bind(&ZipReader::ExtractChunk, - weak_ptr_factory_.GetWeakPtr(), - Passed(output_file.Pass()), - success_callback, - failure_callback, - progress_callback, - 0 /* initial offset */)); + base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), + Passed(std::move(output_file)), success_callback, + failure_callback, progress_callback, 0 /* initial offset */)); } bool ZipReader::ExtractCurrentEntryIntoDirectory( @@ -438,9 +438,9 @@ // correct. However, we need to assume that the uncompressed size could be // incorrect therefore this function needs to read as much data as possible. std::string contents; - contents.reserve(static_cast<size_t>(std::min( - static_cast<int64>(max_read_bytes), - current_entry_info()->original_size()))); + contents.reserve( + static_cast<size_t>(std::min(static_cast<int64_t>(max_read_bytes), + current_entry_info()->original_size()))); StringWriterDelegate writer(max_read_bytes, &contents); if (!ExtractCurrentEntry(&writer)) @@ -476,7 +476,7 @@ const SuccessCallback& success_callback, const FailureCallback& failure_callback, const ProgressCallback& progress_callback, - const int64 offset) { + const int64_t offset) { char buffer[internal::kZipBufSize]; const int num_bytes_read = unzReadCurrentFile(zip_file_, @@ -497,20 +497,15 @@ return; } - int64 current_progress = offset + num_bytes_read; + int64_t current_progress = offset + num_bytes_read; progress_callback.Run(current_progress); base::MessageLoop::current()->PostTask( FROM_HERE, - base::Bind(&ZipReader::ExtractChunk, - weak_ptr_factory_.GetWeakPtr(), - Passed(output_file.Pass()), - success_callback, - failure_callback, - progress_callback, - current_progress)); - + base::Bind(&ZipReader::ExtractChunk, weak_ptr_factory_.GetWeakPtr(), + Passed(std::move(output_file)), success_callback, + failure_callback, progress_callback, current_progress)); } }
diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h index da6cc93..27cc81f 100644 --- a/third_party/zlib/google/zip_reader.h +++ b/third_party/zlib/google/zip_reader.h
@@ -4,13 +4,16 @@ #ifndef THIRD_PARTY_ZLIB_GOOGLE_ZIP_READER_H_ #define THIRD_PARTY_ZLIB_GOOGLE_ZIP_READER_H_ +#include <stddef.h> +#include <stdint.h> + #include <string> -#include "base/basictypes.h" #include "base/callback.h" #include "base/files/file.h" #include "base/files/file_path.h" #include "base/files/file_util.h" +#include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/time/time.h" @@ -64,7 +67,7 @@ typedef base::Closure FailureCallback; // A callback that is called periodically during the operation with the number // of bytes that have been processed so far. - typedef base::Callback<void(int64)> ProgressCallback; + typedef base::Callback<void(int64_t)> ProgressCallback; // This class represents information of an entry (file or directory) in // a zip file. @@ -81,7 +84,7 @@ // Returns 0 if the entry is a directory. // Note: this value should not be trusted, because it is stored as metadata // in the zip archive and can be different from the real uncompressed size. - int64 original_size() const { return original_size_; } + int64_t original_size() const { return original_size_; } // Returns the last modified time. If the time stored in the zip file was // not valid, the unix epoch will be returned. @@ -103,7 +106,7 @@ private: const base::FilePath file_path_; - int64 original_size_; + int64_t original_size_; base::Time last_modified_; bool is_directory_; bool is_unsafe_; @@ -237,7 +240,7 @@ const SuccessCallback& success_callback, const FailureCallback& failure_callback, const ProgressCallback& progress_callback, - const int64 offset); + const int64_t offset); unzFile zip_file_; int num_entries_;
diff --git a/third_party/zlib/google/zip_reader_unittest.cc b/third_party/zlib/google/zip_reader_unittest.cc index 89b4ac5..0073bbb6 100644 --- a/third_party/zlib/google/zip_reader_unittest.cc +++ b/third_party/zlib/google/zip_reader_unittest.cc
@@ -4,6 +4,10 @@ #include "third_party/zlib/google/zip_reader.h" +#include <stddef.h> +#include <stdint.h> +#include <string.h> + #include <set> #include <string> @@ -12,6 +16,7 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" +#include "base/macros.h" #include "base/md5.h" #include "base/path_service.h" #include "base/run_loop.h" @@ -80,7 +85,7 @@ } // Progress callback for async functions. - void OnUnzipProgress(int64 progress) { + void OnUnzipProgress(int64_t progress) { DCHECK(progress > current_progress_); progress_calls_++; current_progress_ = progress; @@ -96,7 +101,7 @@ int failure_calls_; int progress_calls_; - int64 current_progress_; + int64_t current_progress_; }; class MockWriterDelegate : public zip::WriterDelegate { @@ -507,7 +512,7 @@ const std::string md5 = base::MD5String(output); EXPECT_EQ(kQuuxExpectedMD5, md5); - int64 file_size = 0; + int64_t file_size = 0; ASSERT_TRUE(base::GetFileSize(target_file, &file_size)); EXPECT_EQ(file_size, listener.current_progress());
diff --git a/third_party/zlib/google/zip_unittest.cc b/third_party/zlib/google/zip_unittest.cc index eda9a680..d54a5a8 100644 --- a/third_party/zlib/google/zip_unittest.cc +++ b/third_party/zlib/google/zip_unittest.cc
@@ -2,6 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include <stddef.h> +#include <stdint.h> + #include <set> #include <string> #include <vector> @@ -14,6 +17,7 @@ #include "base/path_service.h" #include "base/strings/string_util.h" #include "base/strings/stringprintf.h" +#include "build/build_config.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #include "third_party/zlib/google/zip.h" @@ -325,9 +329,9 @@ SCOPED_TRACE(base::StringPrintf("Processing %d.txt", i)); base::FilePath file_path = temp_dir.AppendASCII( base::StringPrintf("%d.txt", i)); - int64 file_size = -1; + int64_t file_size = -1; EXPECT_TRUE(base::GetFileSize(file_path, &file_size)); - EXPECT_EQ(static_cast<int64>(i), file_size); + EXPECT_EQ(static_cast<int64_t>(i), file_size); } }
diff --git a/tools/gn/build_settings.cc b/tools/gn/build_settings.cc index 63ff3584..72a74c3 100644 --- a/tools/gn/build_settings.cc +++ b/tools/gn/build_settings.cc
@@ -4,6 +4,8 @@ #include "tools/gn/build_settings.h" +#include <utility> + #include "base/files/file_util.h" #include "tools/gn/filesystem_utils.h" @@ -60,5 +62,5 @@ void BuildSettings::ItemDefined(scoped_ptr<Item> item) const { DCHECK(item); if (!item_defined_callback_.is_null()) - item_defined_callback_.Run(item.Pass()); + item_defined_callback_.Run(std::move(item)); }
diff --git a/tools/gn/build_settings.h b/tools/gn/build_settings.h index 71d0fb9..8fe2ce9 100644 --- a/tools/gn/build_settings.h +++ b/tools/gn/build_settings.h
@@ -7,6 +7,7 @@ #include <map> #include <set> +#include <utility> #include "base/callback.h" #include "base/files/file_path.h" @@ -91,7 +92,7 @@ return exec_script_whitelist_.get(); } void set_exec_script_whitelist(scoped_ptr<std::set<SourceFile>> list) { - exec_script_whitelist_ = list.Pass(); + exec_script_whitelist_ = std::move(list); } // When set (the default), code should perform normal validation of inputs
diff --git a/tools/gn/builder.cc b/tools/gn/builder.cc index 5af7c3d..a05493b 100644 --- a/tools/gn/builder.cc +++ b/tools/gn/builder.cc
@@ -5,6 +5,7 @@ #include "tools/gn/builder.h" #include <stddef.h> +#include <utility> #include "tools/gn/config.h" #include "tools/gn/deps_iterator.h" @@ -82,7 +83,7 @@ return; } - record->set_item(item.Pass()); + record->set_item(std::move(item)); // Do target-specific dependency setup. This will also schedule dependency // loads for targets that are required.
diff --git a/tools/gn/builder_record.h b/tools/gn/builder_record.h index 0940cc8..469b1cf 100644 --- a/tools/gn/builder_record.h +++ b/tools/gn/builder_record.h
@@ -6,6 +6,7 @@ #define TOOLS_GN_BUILDER_RECORD_H_ #include <set> +#include <utility> #include "base/macros.h" #include "base/memory/scoped_ptr.h" @@ -54,7 +55,7 @@ Item* item() { return item_.get(); } const Item* item() const { return item_.get(); } - void set_item(scoped_ptr<Item> item) { item_ = item.Pass(); } + void set_item(scoped_ptr<Item> item) { item_ = std::move(item); } // Indicates from where this item was originally referenced from that caused // it to be loaded. For targets for which we encountered the declaration
diff --git a/tools/gn/function_toolchain.cc b/tools/gn/function_toolchain.cc index ed4bbc3..5853255 100644 --- a/tools/gn/function_toolchain.cc +++ b/tools/gn/function_toolchain.cc
@@ -4,6 +4,7 @@ #include <algorithm> #include <limits> +#include <utility> #include "tools/gn/err.h" #include "tools/gn/functions.h" @@ -892,7 +893,7 @@ if (!block_scope.CheckForUnusedVars(err)) return Value(); - toolchain->SetTool(tool_type, tool.Pass()); + toolchain->SetTool(tool_type, std::move(tool)); return Value(); }
diff --git a/tools/gn/functions.cc b/tools/gn/functions.cc index d3d5d25..fb02fa8 100644 --- a/tools/gn/functions.cc +++ b/tools/gn/functions.cc
@@ -5,8 +5,8 @@ #include "tools/gn/functions.h" #include <stddef.h> - #include <iostream> +#include <utility> #include "base/environment.h" #include "base/strings/string_util.h" @@ -673,7 +673,7 @@ scoped_ptr<PatternList> f(new PatternList); f->SetFromValue(args[0], err); if (!err->has_error()) - scope->set_sources_assignment_filter(f.Pass()); + scope->set_sources_assignment_filter(std::move(f)); } return Value(); }
diff --git a/tools/gn/functions_unittest.cc b/tools/gn/functions_unittest.cc index 6a6c679..e2f6756 100644 --- a/tools/gn/functions_unittest.cc +++ b/tools/gn/functions_unittest.cc
@@ -2,8 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/functions.h" + +#include <utility> + +#include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/parse_tree.h" #include "tools/gn/test_with_scope.h" #include "tools/gn/value.h" @@ -47,7 +50,7 @@ undef_accessor->set_member(scoped_ptr<IdentifierNode>( new IdentifierNode(undefined_token))); ListNode args_list_accessor_defined; - args_list_accessor_defined.append_item(undef_accessor.Pass()); + args_list_accessor_defined.append_item(std::move(undef_accessor)); result = functions::RunDefined(setup.scope(), &function_call, &args_list_accessor_defined, &err); ASSERT_EQ(Value::BOOLEAN, result.type());
diff --git a/tools/gn/input_conversion.cc b/tools/gn/input_conversion.cc index cca23e1..b43ee121 100644 --- a/tools/gn/input_conversion.cc +++ b/tools/gn/input_conversion.cc
@@ -4,6 +4,8 @@ #include "tools/gn/input_conversion.h" +#include <utility> + #include "base/macros.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" @@ -81,7 +83,7 @@ // we made, rather than the result of running the block (which will be empty). if (what == PARSE_SCOPE) { DCHECK(result.type() == Value::NONE); - result = Value(origin, scope.Pass()); + result = Value(origin, std::move(scope)); } return result; }
diff --git a/tools/gn/input_file_manager.cc b/tools/gn/input_file_manager.cc index b90a9f1..de84101 100644 --- a/tools/gn/input_file_manager.cc +++ b/tools/gn/input_file_manager.cc
@@ -4,6 +4,8 @@ #include "tools/gn/input_file_manager.h" +#include <utility> + #include "base/bind.h" #include "base/stl_util.h" #include "tools/gn/filesystem_utils.h" @@ -287,7 +289,7 @@ data->loaded = true; if (success) { data->tokens.swap(tokens); - data->parsed_root = root.Pass(); + data->parsed_root = std::move(root); } else { data->parse_error = *err; }
diff --git a/tools/gn/loader_unittest.cc b/tools/gn/loader_unittest.cc index 914e475..6496eaa 100644 --- a/tools/gn/loader_unittest.cc +++ b/tools/gn/loader_unittest.cc
@@ -78,7 +78,7 @@ EXPECT_FALSE(err.has_error()); // Parse. - canned->root = Parser::Parse(canned->tokens, &err).Pass(); + canned->root = Parser::Parse(canned->tokens, &err); EXPECT_FALSE(err.has_error()); canned_responses_[source_file] = std::move(canned);
diff --git a/tools/gn/ninja_binary_target_writer_unittest.cc b/tools/gn/ninja_binary_target_writer_unittest.cc index b9c50b7..dc9c8dd 100644 --- a/tools/gn/ninja_binary_target_writer_unittest.cc +++ b/tools/gn/ninja_binary_target_writer_unittest.cc
@@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "tools/gn/ninja_binary_target_writer.h" + #include <sstream> +#include <utility> #include "testing/gtest/include/gtest/gtest.h" -#include "tools/gn/ninja_binary_target_writer.h" #include "tools/gn/scheduler.h" #include "tools/gn/target.h" #include "tools/gn/test_with_scope.h" @@ -485,7 +487,7 @@ cxx_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); cxx_tool->set_precompiled_header_type(Tool::PCH_MSVC); - pch_toolchain.SetTool(Toolchain::TYPE_CXX, cxx_tool.Pass()); + pch_toolchain.SetTool(Toolchain::TYPE_CXX, std::move(cxx_tool)); // Add a C compiler as well. scoped_ptr<Tool> cc_tool(new Tool); @@ -496,7 +498,7 @@ cc_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); cc_tool->set_precompiled_header_type(Tool::PCH_MSVC); - pch_toolchain.SetTool(Toolchain::TYPE_CC, cc_tool.Pass()); + pch_toolchain.SetTool(Toolchain::TYPE_CC, std::move(cc_tool)); pch_toolchain.ToolchainSetupComplete(); // This target doesn't specify precompiled headers. @@ -613,7 +615,7 @@ cxx_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); cxx_tool->set_precompiled_header_type(Tool::PCH_GCC); - pch_toolchain.SetTool(Toolchain::TYPE_CXX, cxx_tool.Pass()); + pch_toolchain.SetTool(Toolchain::TYPE_CXX, std::move(cxx_tool)); pch_toolchain.ToolchainSetupComplete(); // Add a C compiler as well. @@ -625,7 +627,7 @@ cc_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); cc_tool->set_precompiled_header_type(Tool::PCH_GCC); - pch_toolchain.SetTool(Toolchain::TYPE_CC, cc_tool.Pass()); + pch_toolchain.SetTool(Toolchain::TYPE_CC, std::move(cc_tool)); pch_toolchain.ToolchainSetupComplete(); // This target doesn't specify precompiled headers.
diff --git a/tools/gn/operators_unittest.cc b/tools/gn/operators_unittest.cc index 20e344f..0e7308d2 100644 --- a/tools/gn/operators_unittest.cc +++ b/tools/gn/operators_unittest.cc
@@ -2,10 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "tools/gn/operators.h" + #include <stdint.h> +#include <utility> #include "testing/gtest/include/gtest/gtest.h" -#include "tools/gn/operators.h" #include "tools/gn/parse_tree.h" #include "tools/gn/pattern.h" #include "tools/gn/test_with_scope.h" @@ -30,7 +32,7 @@ scoped_ptr<ListNode> ListWithLiteral(const Token& token) { scoped_ptr<ListNode> list(new ListNode); list->append_item(scoped_ptr<ParseNode>(new LiteralNode(token))); - return list.Pass(); + return list; } } // namespace @@ -56,7 +58,7 @@ // Set up the filter on the scope to remove everything ending with "rm" scoped_ptr<PatternList> pattern_list(new PatternList); pattern_list->Append(Pattern("*rm")); - setup.scope()->set_sources_assignment_filter(pattern_list.Pass()); + setup.scope()->set_sources_assignment_filter(std::move(pattern_list)); // Append an integer. const char integer_value[] = "5"; @@ -121,7 +123,7 @@ const char twelve_str[] = "12"; Token twelve(Location(), Token::INTEGER, twelve_str); outer_list->append_item(ListWithLiteral(twelve)); - node.set_right(outer_list.Pass()); + node.set_right(std::move(outer_list)); Value ret = ExecuteBinaryOperator(setup.scope(), &node, node.left(), node.right(), &err);
diff --git a/tools/gn/parse_tree.h b/tools/gn/parse_tree.h index 3e6f87a..6693bbd19 100644 --- a/tools/gn/parse_tree.h +++ b/tools/gn/parse_tree.h
@@ -6,7 +6,7 @@ #define TOOLS_GN_PARSE_TREE_H_ #include <stddef.h> - +#include <utility> #include <vector> #include "base/macros.h" @@ -150,12 +150,12 @@ // Index is the expression inside the []. Will be null if member is set. const ParseNode* index() const { return index_.get(); } - void set_index(scoped_ptr<ParseNode> i) { index_ = i.Pass(); } + void set_index(scoped_ptr<ParseNode> i) { index_ = std::move(i); } // The member is the identifier on the right hand side of the dot. Will be // null if the index is set. const IdentifierNode* member() const { return member_.get(); } - void set_member(scoped_ptr<IdentifierNode> i) { member_ = i.Pass(); } + void set_member(scoped_ptr<IdentifierNode> i) { member_ = std::move(i); } void SetNewLocation(int line_number); @@ -192,14 +192,10 @@ void set_op(const Token& t) { op_ = t; } const ParseNode* left() const { return left_.get(); } - void set_left(scoped_ptr<ParseNode> left) { - left_ = left.Pass(); - } + void set_left(scoped_ptr<ParseNode> left) { left_ = std::move(left); } const ParseNode* right() const { return right_.get(); } - void set_right(scoped_ptr<ParseNode> right) { - right_ = right.Pass(); - } + void set_right(scoped_ptr<ParseNode> right) { right_ = std::move(right); } private: scoped_ptr<ParseNode> left_; @@ -225,7 +221,7 @@ void Print(std::ostream& out, int indent) const override; void set_begin_token(const Token& t) { begin_token_ = t; } - void set_end(scoped_ptr<EndNode> e) { end_ = e.Pass(); } + void set_end(scoped_ptr<EndNode> e) { end_ = std::move(e); } const EndNode* End() const { return end_.get(); } const std::vector<ParseNode*>& statements() const { return statements_; } @@ -263,21 +259,15 @@ void set_if_token(const Token& token) { if_token_ = token; } const ParseNode* condition() const { return condition_.get(); } - void set_condition(scoped_ptr<ParseNode> c) { - condition_ = c.Pass(); - } + void set_condition(scoped_ptr<ParseNode> c) { condition_ = std::move(c); } const BlockNode* if_true() const { return if_true_.get(); } - void set_if_true(scoped_ptr<BlockNode> t) { - if_true_ = t.Pass(); - } + void set_if_true(scoped_ptr<BlockNode> t) { if_true_ = std::move(t); } // This is either empty, a block (for the else clause), or another // condition. const ParseNode* if_false() const { return if_false_.get(); } - void set_if_false(scoped_ptr<ParseNode> f) { - if_false_ = f.Pass(); - } + void set_if_false(scoped_ptr<ParseNode> f) { if_false_ = std::move(f); } private: // Token corresponding to the "if" string. @@ -309,10 +299,10 @@ void set_function(Token t) { function_ = t; } const ListNode* args() const { return args_.get(); } - void set_args(scoped_ptr<ListNode> a) { args_ = a.Pass(); } + void set_args(scoped_ptr<ListNode> a) { args_ = std::move(a); } const BlockNode* block() const { return block_.get(); } - void set_block(scoped_ptr<BlockNode> b) { block_ = b.Pass(); } + void set_block(scoped_ptr<BlockNode> b) { block_ = std::move(b); } private: Token function_; @@ -365,7 +355,7 @@ void Print(std::ostream& out, int indent) const override; void set_begin_token(const Token& t) { begin_token_ = t; } - void set_end(scoped_ptr<EndNode> e) { end_ = e.Pass(); } + void set_end(scoped_ptr<EndNode> e) { end_ = std::move(e); } const EndNode* End() const { return end_.get(); } void append_item(scoped_ptr<ParseNode> s) { @@ -455,7 +445,7 @@ const ParseNode* operand() const { return operand_.get(); } void set_operand(scoped_ptr<ParseNode> operand) { - operand_ = operand.Pass(); + operand_ = std::move(operand); } private:
diff --git a/tools/gn/parse_tree_unittest.cc b/tools/gn/parse_tree_unittest.cc index bf6c716..b46114f 100644 --- a/tools/gn/parse_tree_unittest.cc +++ b/tools/gn/parse_tree_unittest.cc
@@ -2,11 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "tools/gn/parse_tree.h" + #include <stdint.h> +#include <utility> #include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/input_file.h" -#include "tools/gn/parse_tree.h" #include "tools/gn/scope.h" #include "tools/gn/test_with_scope.h" @@ -24,7 +26,7 @@ scoped_ptr<IdentifierNode> member_identifier( new IdentifierNode(member_token)); - accessor.set_member(member_identifier.Pass()); + accessor.set_member(std::move(member_identifier)); // The access should fail because a is not defined. Err err;
diff --git a/tools/gn/parser.cc b/tools/gn/parser.cc index b2e22fb..79966b8 100644 --- a/tools/gn/parser.cc +++ b/tools/gn/parser.cc
@@ -4,6 +4,8 @@ #include "tools/gn/parser.h" +#include <utility> + #include "base/logging.h" #include "tools/gn/functions.h" #include "tools/gn/operators.h" @@ -215,7 +217,7 @@ *err = Err(p.cur_token(), "Trailing garbage"); return nullptr; } - return expr.Pass(); + return expr; } // static @@ -328,7 +330,7 @@ scoped_ptr<ParseNode> left = (this->*prefix)(token); if (has_error()) - return left.Pass(); + return left; while (!at_end() && !IsStatementBreak(cur_token().type()) && precedence <= expressions_[cur_token().type()].precedence) { @@ -340,12 +342,12 @@ token.value().as_string() + std::string("'")); return scoped_ptr<ParseNode>(); } - left = (this->*infix)(left.Pass(), token); + left = (this->*infix)(std::move(left), token); if (has_error()) return scoped_ptr<ParseNode>(); } - return left.Pass(); + return left; } scoped_ptr<ParseNode> Parser::Literal(Token token) { @@ -353,13 +355,13 @@ } scoped_ptr<ParseNode> Parser::Name(Token token) { - return IdentifierOrCall(scoped_ptr<ParseNode>(), token).Pass(); + return IdentifierOrCall(scoped_ptr<ParseNode>(), token); } scoped_ptr<ParseNode> Parser::BlockComment(Token token) { scoped_ptr<BlockCommentNode> comment(new BlockCommentNode()); comment->set_comment(token); - return comment.Pass(); + return std::move(comment); } scoped_ptr<ParseNode> Parser::Group(Token token) { @@ -367,7 +369,7 @@ if (has_error()) return scoped_ptr<ParseNode>(); Consume(Token::RIGHT_PAREN, "Expected ')'"); - return expr.Pass(); + return expr; } scoped_ptr<ParseNode> Parser::Not(Token token) { @@ -381,15 +383,15 @@ } scoped_ptr<UnaryOpNode> unary_op(new UnaryOpNode); unary_op->set_op(token); - unary_op->set_operand(expr.Pass()); - return unary_op.Pass(); + unary_op->set_operand(std::move(expr)); + return std::move(unary_op); } scoped_ptr<ParseNode> Parser::List(Token node) { scoped_ptr<ParseNode> list(ParseList(node, Token::RIGHT_BRACKET, true)); if (!has_error() && !at_end()) Consume(Token::RIGHT_BRACKET, "Expected ']'"); - return list.Pass(); + return list; } scoped_ptr<ParseNode> Parser::BinaryOperator(scoped_ptr<ParseNode> left, @@ -405,9 +407,9 @@ } scoped_ptr<BinaryOpNode> binary_op(new BinaryOpNode); binary_op->set_op(token); - binary_op->set_left(left.Pass()); - binary_op->set_right(right.Pass()); - return binary_op.Pass(); + binary_op->set_left(std::move(left)); + binary_op->set_right(std::move(right)); + return std::move(binary_op); } scoped_ptr<ParseNode> Parser::IdentifierOrCall(scoped_ptr<ParseNode> left, @@ -439,14 +441,14 @@ if (!left && !has_arg) { // Not a function call, just a standalone identifier. - return scoped_ptr<ParseNode>(new IdentifierNode(token)).Pass(); + return scoped_ptr<ParseNode>(new IdentifierNode(token)); } scoped_ptr<FunctionCallNode> func_call(new FunctionCallNode); func_call->set_function(token); - func_call->set_args(list.Pass()); + func_call->set_args(std::move(list)); if (block) - func_call->set_block(block.Pass()); - return func_call.Pass(); + func_call->set_block(std::move(block)); + return std::move(func_call); } scoped_ptr<ParseNode> Parser::Assignment(scoped_ptr<ParseNode> left, @@ -463,9 +465,9 @@ } scoped_ptr<BinaryOpNode> assign(new BinaryOpNode); assign->set_op(token); - assign->set_left(left.Pass()); - assign->set_right(value.Pass()); - return assign.Pass(); + assign->set_left(std::move(left)); + assign->set_right(std::move(value)); + return std::move(assign); } scoped_ptr<ParseNode> Parser::Subscript(scoped_ptr<ParseNode> left, @@ -483,8 +485,8 @@ Consume(Token::RIGHT_BRACKET, "Expecting ']' after subscript."); scoped_ptr<AccessorNode> accessor(new AccessorNode); accessor->set_base(left->AsIdentifier()->value()); - accessor->set_index(value.Pass()); - return accessor.Pass(); + accessor->set_index(std::move(value)); + return std::move(accessor); } scoped_ptr<ParseNode> Parser::DotOperator(scoped_ptr<ParseNode> left, @@ -508,7 +510,7 @@ accessor->set_base(left->AsIdentifier()->value()); accessor->set_member(scoped_ptr<IdentifierNode>( static_cast<IdentifierNode*>(right.release()))); - return accessor.Pass(); + return std::move(accessor); } // Does not Consume the start or end token. @@ -553,7 +555,7 @@ return scoped_ptr<ListNode>(); } list->set_end(make_scoped_ptr(new EndNode(cur_token()))); - return list.Pass(); + return list; } scoped_ptr<ParseNode> Parser::ParseFile() { @@ -564,7 +566,7 @@ scoped_ptr<ParseNode> statement = ParseStatement(); if (!statement) break; - file->append_statement(statement.Pass()); + file->append_statement(std::move(statement)); } if (!at_end() && !has_error()) *err_ = Err(cur_token(), "Unexpected here, should be newline."); @@ -577,7 +579,7 @@ // ignorant of them. AssignComments(file.get()); - return file.Pass(); + return std::move(file); } scoped_ptr<ParseNode> Parser::ParseStatement() { @@ -591,7 +593,7 @@ scoped_ptr<ParseNode> stmt = ParseExpression(); if (stmt) { if (stmt->AsFunctionCall() || IsAssignment(stmt.get())) - return stmt.Pass(); + return stmt; } if (!has_error()) { Token token = at_end() ? tokens_[tokens_.size() - 1] : cur_token(); @@ -618,9 +620,9 @@ scoped_ptr<ParseNode> statement = ParseStatement(); if (!statement) return scoped_ptr<BlockNode>(); - block->append_statement(statement.Pass()); + block->append_statement(std::move(statement)); } - return block.Pass(); + return block; } scoped_ptr<ParseNode> Parser::ParseCondition() { @@ -631,12 +633,12 @@ if (IsAssignment(condition->condition())) *err_ = Err(condition->condition(), "Assignment not allowed in 'if'."); Consume(Token::RIGHT_PAREN, "Expected ')' after condition of 'if'."); - condition->set_if_true(ParseBlock().Pass()); + condition->set_if_true(ParseBlock()); if (Match(Token::ELSE)) { if (LookAhead(Token::LEFT_BRACE)) { - condition->set_if_false(ParseBlock().Pass()); + condition->set_if_false(ParseBlock()); } else if (LookAhead(Token::IF)) { - condition->set_if_false(ParseStatement().Pass()); + condition->set_if_false(ParseStatement()); } else { *err_ = Err(cur_token(), "Expected '{' or 'if' after 'else'."); return scoped_ptr<ParseNode>(); @@ -644,7 +646,7 @@ } if (has_error()) return scoped_ptr<ParseNode>(); - return condition.Pass(); + return std::move(condition); } void Parser::TraverseOrder(const ParseNode* root,
diff --git a/tools/gn/scope.cc b/tools/gn/scope.cc index 37ddbdd..2bf9dd4 100644 --- a/tools/gn/scope.cc +++ b/tools/gn/scope.cc
@@ -377,7 +377,7 @@ NonRecursiveMergeTo(result.get(), options, nullptr, "<SHOULDN'T HAPPEN>", &err); DCHECK(!err.has_error()); - return result.Pass(); + return result; } Scope* Scope::MakeTargetDefaults(const std::string& target_type) {
diff --git a/tools/gn/scope.h b/tools/gn/scope.h index 0b9bfbe..7b32941 100644 --- a/tools/gn/scope.h +++ b/tools/gn/scope.h
@@ -7,6 +7,7 @@ #include <map> #include <set> +#include <utility> #include "base/containers/hash_tables.h" #include "base/macros.h" @@ -240,7 +241,7 @@ const PatternList* GetSourcesAssignmentFilter() const; void set_sources_assignment_filter( scoped_ptr<PatternList> f) { - sources_assignment_filter_ = f.Pass(); + sources_assignment_filter_ = std::move(f); } // Indicates if we're currently processing the build configuration file.
diff --git a/tools/gn/setup.cc b/tools/gn/setup.cc index 87339ca4..774d877 100644 --- a/tools/gn/setup.cc +++ b/tools/gn/setup.cc
@@ -5,9 +5,9 @@ #include "tools/gn/setup.h" #include <stdlib.h> - #include <algorithm> #include <sstream> +#include <utility> #include "base/bind.h" #include "base/command_line.h" @@ -652,7 +652,7 @@ return false; } } - build_settings_.set_exec_script_whitelist(whitelist.Pass()); + build_settings_.set_exec_script_whitelist(std::move(whitelist)); } return true;
diff --git a/tools/gn/string_utils_unittest.cc b/tools/gn/string_utils_unittest.cc index a00e824..4e18eb5 100644 --- a/tools/gn/string_utils_unittest.cc +++ b/tools/gn/string_utils_unittest.cc
@@ -2,13 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "tools/gn/string_utils.h" + #include <stdint.h> +#include <utility> #include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/err.h" #include "tools/gn/scope.h" #include "tools/gn/settings.h" -#include "tools/gn/string_utils.h" #include "tools/gn/token.h" #include "tools/gn/value.h" @@ -23,7 +25,7 @@ // Nested scope called "onescope" with a value "one" inside it. scoped_ptr<Scope> onescope(new Scope(static_cast<const Settings*>(nullptr))); onescope->SetValue("one", Value(nullptr, one), nullptr); - scope.SetValue("onescope", Value(nullptr, onescope.Pass()), nullptr); + scope.SetValue("onescope", Value(nullptr, std::move(onescope)), nullptr); // List called "onelist" with one value that maps to 1. Value onelist(nullptr, Value::LIST);
diff --git a/tools/gn/target_unittest.cc b/tools/gn/target_unittest.cc index 986fa65..4d9b1da8 100644 --- a/tools/gn/target_unittest.cc +++ b/tools/gn/target_unittest.cc
@@ -2,12 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "tools/gn/target.h" + +#include <utility> + #include "testing/gtest/include/gtest/gtest.h" #include "tools/gn/build_settings.h" #include "tools/gn/config.h" #include "tools/gn/scheduler.h" #include "tools/gn/settings.h" -#include "tools/gn/target.h" #include "tools/gn/test_with_scope.h" #include "tools/gn/toolchain.h" @@ -445,7 +448,7 @@ solink_tool->set_outputs(SubstitutionList::MakeForTest( kLinkPattern, kDependPattern)); - toolchain.SetTool(Toolchain::TYPE_SOLINK, solink_tool.Pass()); + toolchain.SetTool(Toolchain::TYPE_SOLINK, std::move(solink_tool)); Target target(setup.settings(), Label(SourceDir("//a/"), "a")); target.set_output_type(Target::SHARED_LIBRARY);
diff --git a/tools/gn/template.cc b/tools/gn/template.cc index 3d58b9a..012e716 100644 --- a/tools/gn/template.cc +++ b/tools/gn/template.cc
@@ -4,6 +4,8 @@ #include "tools/gn/template.h" +#include <utility> + #include "tools/gn/err.h" #include "tools/gn/functions.h" #include "tools/gn/parse_tree.h" @@ -17,9 +19,7 @@ } Template::Template(scoped_ptr<Scope> scope, const FunctionCallNode* def) - : closure_(scope.Pass()), - definition_(def) { -} + : closure_(std::move(scope)), definition_(def) {} Template::~Template() { } @@ -81,7 +81,7 @@ template_scope.SetValue(kInvoker, Value(nullptr, scoped_ptr<Scope>()), invocation); Value* invoker_value = template_scope.GetMutableValue(kInvoker, false); - invoker_value->SetScopeValue(invocation_scope.Pass()); + invoker_value->SetScopeValue(std::move(invocation_scope)); template_scope.set_source_dir(scope->GetSourceDir()); const base::StringPiece target_name("target_name");
diff --git a/tools/gn/test_with_scope.cc b/tools/gn/test_with_scope.cc index a6953ae..8890338 100644 --- a/tools/gn/test_with_scope.cc +++ b/tools/gn/test_with_scope.cc
@@ -4,6 +4,8 @@ #include "tools/gn/test_with_scope.h" +#include <utility> + #include "base/bind.h" #include "tools/gn/parser.h" #include "tools/gn/tokenizer.h" @@ -47,7 +49,7 @@ cc_tool.get()); cc_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); - toolchain->SetTool(Toolchain::TYPE_CC, cc_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_CC, std::move(cc_tool)); // CXX scoped_ptr<Tool> cxx_tool(new Tool); @@ -57,7 +59,7 @@ cxx_tool.get()); cxx_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); - toolchain->SetTool(Toolchain::TYPE_CXX, cxx_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_CXX, std::move(cxx_tool)); // OBJC scoped_ptr<Tool> objc_tool(new Tool); @@ -67,7 +69,7 @@ objc_tool.get()); objc_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); - toolchain->SetTool(Toolchain::TYPE_OBJC, objc_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_OBJC, std::move(objc_tool)); // OBJC scoped_ptr<Tool> objcxx_tool(new Tool); @@ -77,7 +79,7 @@ objcxx_tool.get()); objcxx_tool->set_outputs(SubstitutionList::MakeForTest( "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o")); - toolchain->SetTool(Toolchain::TYPE_OBJCXX, objcxx_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_OBJCXX, std::move(objcxx_tool)); // Don't use RC and ASM tools in unit tests yet. Add here if needed. @@ -89,7 +91,7 @@ alink_tool->set_output_prefix("lib"); alink_tool->set_outputs(SubstitutionList::MakeForTest( "{{target_out_dir}}/{{target_output_name}}.a")); - toolchain->SetTool(Toolchain::TYPE_ALINK, alink_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_ALINK, std::move(alink_tool)); // SOLINK scoped_ptr<Tool> solink_tool(new Tool); @@ -101,7 +103,7 @@ solink_tool->set_default_output_extension(".so"); solink_tool->set_outputs(SubstitutionList::MakeForTest( "{{root_out_dir}}/{{target_output_name}}{{output_extension}}")); - toolchain->SetTool(Toolchain::TYPE_SOLINK, solink_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_SOLINK, std::move(solink_tool)); // SOLINK_MODULE scoped_ptr<Tool> solink_module_tool(new Tool); @@ -113,7 +115,8 @@ solink_module_tool->set_default_output_extension(".so"); solink_module_tool->set_outputs(SubstitutionList::MakeForTest( "{{root_out_dir}}/{{target_output_name}}{{output_extension}}")); - toolchain->SetTool(Toolchain::TYPE_SOLINK_MODULE, solink_module_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_SOLINK_MODULE, + std::move(solink_module_tool)); // LINK scoped_ptr<Tool> link_tool(new Tool); @@ -123,17 +126,17 @@ link_tool->set_lib_dir_switch("-L"); link_tool->set_outputs(SubstitutionList::MakeForTest( "{{root_out_dir}}/{{target_output_name}}")); - toolchain->SetTool(Toolchain::TYPE_LINK, link_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_LINK, std::move(link_tool)); // STAMP scoped_ptr<Tool> stamp_tool(new Tool); SetCommandForTool("touch {{output}}", stamp_tool.get()); - toolchain->SetTool(Toolchain::TYPE_STAMP, stamp_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_STAMP, std::move(stamp_tool)); // COPY scoped_ptr<Tool> copy_tool(new Tool); SetCommandForTool("cp {{source}} {{output}}", copy_tool.get()); - toolchain->SetTool(Toolchain::TYPE_COPY, copy_tool.Pass()); + toolchain->SetTool(Toolchain::TYPE_COPY, std::move(copy_tool)); toolchain->ToolchainSetupComplete(); }
diff --git a/tools/gn/toolchain.cc b/tools/gn/toolchain.cc index 96cf166..2a70358 100644 --- a/tools/gn/toolchain.cc +++ b/tools/gn/toolchain.cc
@@ -6,6 +6,7 @@ #include <stddef.h> #include <string.h> +#include <utility> #include "base/logging.h" #include "tools/gn/target.h" @@ -88,7 +89,7 @@ DCHECK(type != TYPE_NONE); DCHECK(!tools_[type].get()); t->SetComplete(); - tools_[type] = t.Pass(); + tools_[type] = std::move(t); } void Toolchain::ToolchainSetupComplete() {
diff --git a/tools/gn/value.cc b/tools/gn/value.cc index 6e8bcfa..57f23b07 100644 --- a/tools/gn/value.cc +++ b/tools/gn/value.cc
@@ -5,6 +5,7 @@ #include "tools/gn/value.h" #include <stddef.h> +#include <utility> #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" @@ -60,9 +61,8 @@ string_value_(), boolean_value_(false), int_value_(0), - scope_value_(scope.Pass()), - origin_(origin) { -} + scope_value_(std::move(scope)), + origin_(origin) {} Value::Value(const Value& other) : type_(other.type_), @@ -113,7 +113,7 @@ void Value::SetScopeValue(scoped_ptr<Scope> scope) { DCHECK(type_ == SCOPE); - scope_value_ = scope.Pass(); + scope_value_ = std::move(scope); } std::string Value::ToString(bool quote_string) const {
diff --git a/tools/grit/grit/format/resource_map.py b/tools/grit/grit/format/resource_map.py index 37ac54ad..aca9f7f 100755 --- a/tools/grit/grit/format/resource_map.py +++ b/tools/grit/grit/format/resource_map.py
@@ -83,7 +83,10 @@ #include "%(map_header_file)s" -#include "base/basictypes.h" +#include <stddef.h> + +#include "base/macros.h" + #include "%(rc_header_file)s" const GritResourceMap %(map_name)s[] = {
diff --git a/tools/grit/grit/format/resource_map_unittest.py b/tools/grit/grit/format/resource_map_unittest.py index 55de504..f0eb72d 100755 --- a/tools/grit/grit/format/resource_map_unittest.py +++ b/tools/grit/grit/format/resource_map_unittest.py
@@ -68,7 +68,8 @@ resource_map.GetFormatter('resource_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"IDC_KLONKMENU", IDC_KLONKMENU}, @@ -82,7 +83,8 @@ resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"grit/testdata/klonk.rc", IDC_KLONKMENU}, @@ -136,7 +138,8 @@ resource_map.GetFormatter('resource_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"IDR_KLONKMENU", IDR_KLONKMENU}, @@ -146,7 +149,8 @@ resource_map.GetFormatter('resource_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"IDR_KLONKMENU", IDR_KLONKMENU}, @@ -196,7 +200,8 @@ resource_map.GetFormatter('resource_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"IDC_KLONKMENU", IDC_KLONKMENU}, @@ -208,7 +213,8 @@ resource_map.GetFormatter('resource_file_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_resource_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"grit/testdata/klonk.rc", IDC_KLONKMENU}, @@ -266,7 +272,8 @@ resource_map.GetFormatter('resource_map_source')(grd, 'en', '.'))) self.assertEqual('''\ #include "the_rc_map_header.h" -#include "base/basictypes.h" +#include <stddef.h> +#include "base/macros.h" #include "the_rc_header.h" const GritResourceMap kTheRcHeader[] = { {"IDS_PRODUCT_NAME", IDS_PRODUCT_NAME},
diff --git a/tools/json_schema_compiler/test/simple_api_unittest.cc b/tools/json_schema_compiler/test/simple_api_unittest.cc index f100b81..8d38331 100644 --- a/tools/json_schema_compiler/test/simple_api_unittest.cc +++ b/tools/json_schema_compiler/test/simple_api_unittest.cc
@@ -16,7 +16,7 @@ value->SetWithoutPathExpansion("integer", new base::FundamentalValue(4)); value->SetWithoutPathExpansion("string", new base::StringValue("bling")); value->SetWithoutPathExpansion("boolean", new base::FundamentalValue(true)); - return value.Pass(); + return value; } } // namespace
diff --git a/tools/json_schema_compiler/test/test_util.cc b/tools/json_schema_compiler/test/test_util.cc index 79d5f7b..3dc04c9 100644 --- a/tools/json_schema_compiler/test/test_util.cc +++ b/tools/json_schema_compiler/test/test_util.cc
@@ -22,39 +22,39 @@ &error_msg)); // CHECK not ASSERT since passing invalid |json| is a test error. CHECK(result) << error_msg; - return result.Pass(); + return result; } scoped_ptr<base::ListValue> List(base::Value* a) { scoped_ptr<base::ListValue> list(new base::ListValue()); list->Append(a); - return list.Pass(); + return list; } scoped_ptr<base::ListValue> List(base::Value* a, base::Value* b) { scoped_ptr<base::ListValue> list = List(a); list->Append(b); - return list.Pass(); + return list; } scoped_ptr<base::ListValue> List(base::Value* a, base::Value* b, base::Value* c) { scoped_ptr<base::ListValue> list = List(a, b); list->Append(c); - return list.Pass(); + return list; } scoped_ptr<base::DictionaryValue> Dictionary( const std::string& ak, base::Value* av) { scoped_ptr<base::DictionaryValue> dict(new base::DictionaryValue()); dict->SetWithoutPathExpansion(ak, av); - return dict.Pass(); + return dict; } scoped_ptr<base::DictionaryValue> Dictionary( const std::string& ak, base::Value* av, const std::string& bk, base::Value* bv) { scoped_ptr<base::DictionaryValue> dict = Dictionary(ak, av); dict->SetWithoutPathExpansion(bk, bv); - return dict.Pass(); + return dict; } scoped_ptr<base::DictionaryValue> Dictionary( const std::string& ak, base::Value* av, @@ -62,7 +62,7 @@ const std::string& ck, base::Value* cv) { scoped_ptr<base::DictionaryValue> dict = Dictionary(ak, av, bk, bv); dict->SetWithoutPathExpansion(ck, cv); - return dict.Pass(); + return dict; } } // namespace test_util
