clang/win: Fix warnings to prepare for building without -Wno-reorder.

This changes constructor initializer list ordering to match field
declaration ordering, except for gtest and breakpad, where the warning
is disabled.

BUG=505304
NOPRESUBMIT=true

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

Cr-Commit-Position: refs/heads/master@{#337152}

5 files changed, 24 insertions, 21 deletions

diff --git a/components/browser_watcher/window_hang_monitor_win.cc b/components/browser_watcher/window_hang_monitor_win.cc
index a3ca17b..964a6f7 100644
--- a/components/browser_watcher/window_hang_monitor_win.cc
+++ b/components/browser_watcher/window_hang_monitor_win.cc
@@ -30,10 +30,10 @@ WindowHangMonitor::WindowHangMonitor(base::TimeDelta ping_interval,
                                      base::TimeDelta timeout,
                                      const WindowEventCallback& callback)
     : callback_(callback),
-      outstanding_ping_(nullptr),
-      timer_(false /* don't retain user task */, false /* don't repeat */),
       ping_interval_(ping_interval),
-      hang_timeout_(timeout) {
+      hang_timeout_(timeout),
+      timer_(false /* don't retain user task */, false /* don't repeat */),
+      outstanding_ping_(nullptr) {
 }
 
 WindowHangMonitor::~WindowHangMonitor() {
diff --git a/components/browser_watcher/window_hang_monitor_win_unittest.cc b/components/browser_watcher/window_hang_monitor_win_unittest.cc
index 5641956..f884e09 100644
--- a/components/browser_watcher/window_hang_monitor_win_unittest.cc
+++ b/components/browser_watcher/window_hang_monitor_win_unittest.cc
@@ -46,8 +46,8 @@ class HangMonitorThread {
  public:
   // Instantiates the background thread.
   HangMonitorThread()
-      : event_received_(false, false),
-        event_(WindowHangMonitor::WINDOW_NOT_FOUND),
+      : event_(WindowHangMonitor::WINDOW_NOT_FOUND),
+        event_received_(false, false),
         thread_("HangMonitorThread") {}
 
   ~HangMonitorThread() {
diff --git a/components/crash/tools/crash_service.cc b/components/crash/tools/crash_service.cc
index 23d5ec66..f1536fc 100644
--- a/components/crash/tools/crash_service.cc
+++ b/components/crash/tools/crash_service.cc
@@ -152,8 +152,8 @@ const char CrashService::kDumpsDir[]          = "dumps-dir";
 const char CrashService::kPipeName[]          = "pipe-name";
 
 CrashService::CrashService()
-    : sender_(NULL),
-      dumper_(NULL),
+    : dumper_(NULL),
+      sender_(NULL),
       requests_handled_(0),
       requests_sent_(0),
       clients_connected_(0),
diff --git a/components/test_runner/event_sender.cc b/components/test_runner/event_sender.cc
index ed7fa1f..198ee00 100644
--- a/components/test_runner/event_sender.cc
+++ b/components/test_runner/event_sender.cc
@@ -1078,7 +1078,18 @@ EventSender::SavedEvent::SavedEvent()
       modifiers(0) {}
 
 EventSender::EventSender(TestInterfaces* interfaces)
-    : interfaces_(interfaces),
+    :
+#if defined(OS_WIN)
+      wm_key_down_(0),
+      wm_key_up_(0),
+      wm_char_(0),
+      wm_dead_char_(0),
+      wm_sys_key_down_(0),
+      wm_sys_key_up_(0),
+      wm_sys_char_(0),
+      wm_sys_dead_char_(0),
+#endif
+      interfaces_(interfaces),
       delegate_(NULL),
       view_(NULL),
       force_layout_on_events_(false),
@@ -1091,17 +1102,8 @@ EventSender::EventSender(TestInterfaces* interfaces)
       current_drag_effect_(blink::WebDragOperationNone),
       time_offset_ms_(0),
       click_count_(0),
-#if defined(OS_WIN)
-      wm_key_down_(0),
-      wm_key_up_(0),
-      wm_char_(0),
-      wm_dead_char_(0),
-      wm_sys_key_down_(0),
-      wm_sys_key_up_(0),
-      wm_sys_char_(0),
-      wm_sys_dead_char_(0),
-#endif
-      weak_factory_(this) {}
+      weak_factory_(this) {
+}
 
 EventSender::~EventSender() {}
 
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc
index 5145fba..661f602 100644
--- a/components/wifi/wifi_service_win.cc
+++ b/components/wifi/wifi_service_win.cc
@@ -491,11 +491,12 @@ WiFiServiceImpl::WiFiServiceImpl()
       WlanGetProfile_function_(NULL),
       WlanOpenHandle_function_(NULL),
       WlanRegisterNotification_function_(NULL),
-      WlanSaveTemporaryProfile_function_(NULL),
       WlanScan_function_(NULL),
       WlanSetProfile_function_(NULL),
+      WlanSaveTemporaryProfile_function_(NULL),
       client_(NULL),
-      enable_notify_network_changed_(true) {}
+      enable_notify_network_changed_(true) {
+}
 
 WiFiServiceImpl::~WiFiServiceImpl() { UnInitialize(); }