Revert "Move network_connect code to ui/chromeos/network"

ui/chromeos/network/network_state_notifier_unittest.cc

Index: ui/chromeos/network/network_state_notifier_unittest.cc
diff --git a/ui/chromeos/network/network_state_notifier_unittest.cc b/ui/chromeos/network/network_state_notifier_unittest.cc
deleted file mode 100644
index 078b248c3b4e2fcab47de3811e9cd475417709af..0000000000000000000000000000000000000000
--- a/ui/chromeos/network/network_state_notifier_unittest.cc
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright (c) 2012 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 "ui/chromeos/network/network_state_notifier.h"
-
-#include "base/run_loop.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
-#include "chromeos/dbus/shill_device_client.h"
-#include "chromeos/dbus/shill_service_client.h"
-#include "chromeos/login/login_state.h"
-#include "chromeos/network/network_handler.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "testing/platform_test.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/chromeos/network/network_connect.h"
-#include "ui/message_center/message_center.h"
-
-using chromeos::DBusThreadManager;
-using chromeos::ShillDeviceClient;
-using chromeos::ShillServiceClient;
-
-namespace ui {
-namespace test {
-
-class NetworkConnectTestDelegate : public NetworkConnect::Delegate {
- public:
-  NetworkConnectTestDelegate() {}
-  ~NetworkConnectTestDelegate() override {}
-
-  // NetworkConnect::Delegate
-  void ShowNetworkConfigure(const std::string& network_id) override {}
-  void ShowNetworkSettings(const std::string& network_id) override {}
-  bool ShowEnrollNetwork(const std::string& network_id) override {
-    return false;
-  }
-  void ShowMobileSimDialog() override {}
-  void ShowMobileSetupDialog(const std::string& service_path) override {}
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NetworkConnectTestDelegate);
-};
-
-class NetworkStateNotifierTest : public testing::Test {
- public:
-  NetworkStateNotifierTest() {}
-  ~NetworkStateNotifierTest() override {}
-
-  void SetUp() override {
-    testing::Test::SetUp();
-    DBusThreadManager::Initialize();
-    chromeos::LoginState::Initialize();
-    SetupDefaultShillState();
-    chromeos::NetworkHandler::Initialize();
-    message_center::MessageCenter::Initialize();
-    base::RunLoop().RunUntilIdle();
-    network_connect_delegate_.reset(new NetworkConnectTestDelegate);
-    NetworkConnect::Initialize(network_connect_delegate_.get());
-  }
-
-  void TearDown() override {
-    NetworkConnect::Shutdown();
-    network_connect_delegate_.reset();
-    message_center::MessageCenter::Shutdown();
-    chromeos::LoginState::Shutdown();
-    chromeos::NetworkHandler::Shutdown();
-    DBusThreadManager::Shutdown();
-    testing::Test::TearDown();
-  }
-
- protected:
-  void SetupDefaultShillState() {
-    base::RunLoop().RunUntilIdle();
-    ShillDeviceClient::TestInterface* device_test =
-        DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
-    device_test->ClearDevices();
-    device_test->AddDevice("/device/stub_wifi_device1", shill::kTypeWifi,
-                           "stub_wifi_device1");
-    device_test->AddDevice("/device/stub_cellular_device1",
-                           shill::kTypeCellular, "stub_cellular_device1");
-
-    ShillServiceClient::TestInterface* service_test =
-        DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
-    service_test->ClearServices();
-    const bool add_to_visible = true;
-    // Create a wifi network and set to online.
-    service_test->AddService("/service/wifi1", "wifi1_guid", "wifi1",
-                             shill::kTypeWifi, shill::kStateIdle,
-                             add_to_visible);
-    service_test->SetServiceProperty("wifi1", shill::kSecurityProperty,
-                                     base::StringValue(shill::kSecurityWep));
-    service_test->SetServiceProperty("wifi1", shill::kConnectableProperty,
-                                     base::FundamentalValue(true));
-    service_test->SetServiceProperty("wifi1", shill::kPassphraseProperty,
-                                     base::StringValue("failure"));
-    base::RunLoop().RunUntilIdle();
-  }
-
-  scoped_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
-  base::MessageLoop message_loop_;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifierTest);
-};
-
-TEST_F(NetworkStateNotifierTest, ConnectionFailure) {
-  NetworkConnect::Get()->ConnectToNetwork("wifi1");
-    base::RunLoop().RunUntilIdle();
-  // Failure should spawn a notification.
-  message_center::MessageCenter* message_center =
-      message_center::MessageCenter::Get();
-  EXPECT_TRUE(message_center->FindVisibleNotificationById(
-      NetworkStateNotifier::kNetworkConnectNotificationId));
-}
-
-}  // namespace test
-}  // namespace ui