Revert "chromeos: Move files in //ash/common to //ash, part 3"

chrome/browser/chromeos/net/network_portal_notification_controller.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/net/network_portal_notification_controller.h"
 
 #include <stdint.h>
 
 #include <memory>
 #include <vector>
 
+#include "ash/common/wm_shell.h"
 #include "ash/system/system_notifier.h"
 #include "ash/system/tray/system_tray_notifier.h"
-#include "ash/wm_shell.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 415 matching lines @@
   if (dialog_)
     dialog_->Close();
 }
 
 const NetworkPortalWebDialog*
 NetworkPortalNotificationController::GetDialogForTesting() const {
   return dialog_;
 }
 
 }  // namespace chromeos