Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(471)

Side by Side Diff: chrome/browser/chromeos/net/network_state_notifier_unittest.cc

Issue 2799743004: Revert of Use ScopedTaskEnvironment instead of MessageLoop in chrome unit tests. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/browser/local_discovery/local_domain_resolver_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/chromeos/net/network_state_notifier.h" 5 #include "chrome/browser/chromeos/net/network_state_notifier.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "base/test/scoped_task_environment.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 11 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/dbus/shill_device_client.h" 12 #include "chromeos/dbus/shill_device_client.h"
14 #include "chromeos/dbus/shill_service_client.h" 13 #include "chromeos/dbus/shill_service_client.h"
15 #include "chromeos/login/login_state.h" 14 #include "chromeos/login/login_state.h"
16 #include "chromeos/network/network_connect.h" 15 #include "chromeos/network/network_connect.h"
17 #include "chromeos/network/network_handler.h" 16 #include "chromeos/network/network_handler.h"
18 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
19 #include "testing/platform_test.h" 18 #include "testing/platform_test.h"
20 #include "third_party/cros_system_api/dbus/service_constants.h" 19 #include "third_party/cros_system_api/dbus/service_constants.h"
21 #include "ui/message_center/message_center.h" 20 #include "ui/message_center/message_center.h"
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 shill::kSecurityClassProperty, 105 shill::kSecurityClassProperty,
107 base::Value(shill::kSecurityWep)); 106 base::Value(shill::kSecurityWep));
108 service_test->SetServiceProperty( 107 service_test->SetServiceProperty(
109 kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true)); 108 kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
110 service_test->SetServiceProperty( 109 service_test->SetServiceProperty(
111 kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("failure")); 110 kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("failure"));
112 base::RunLoop().RunUntilIdle(); 111 base::RunLoop().RunUntilIdle();
113 } 112 }
114 113
115 std::unique_ptr<NetworkConnectTestDelegate> network_connect_delegate_; 114 std::unique_ptr<NetworkConnectTestDelegate> network_connect_delegate_;
116 base::test::ScopedTaskEnvironment scoped_task_environment_; 115 base::MessageLoop message_loop_;
117 116
118 private: 117 private:
119 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifierTest); 118 DISALLOW_COPY_AND_ASSIGN(NetworkStateNotifierTest);
120 }; 119 };
121 120
122 TEST_F(NetworkStateNotifierTest, ConnectionFailure) { 121 TEST_F(NetworkStateNotifierTest, ConnectionFailure) {
123 NetworkConnect::Get()->ConnectToNetworkId(kWiFi1Guid); 122 NetworkConnect::Get()->ConnectToNetworkId(kWiFi1Guid);
124 base::RunLoop().RunUntilIdle(); 123 base::RunLoop().RunUntilIdle();
125 // Failure should spawn a notification. 124 // Failure should spawn a notification.
126 message_center::MessageCenter* message_center = 125 message_center::MessageCenter* message_center =
127 message_center::MessageCenter::Get(); 126 message_center::MessageCenter::Get();
128 EXPECT_TRUE(message_center->FindVisibleNotificationById( 127 EXPECT_TRUE(message_center->FindVisibleNotificationById(
129 NetworkStateNotifier::kNetworkConnectNotificationId)); 128 NetworkStateNotifier::kNetworkConnectNotificationId));
130 } 129 }
131 130
132 } // namespace test 131 } // namespace test
133 } // namespace chromeos 132 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/local_discovery/local_domain_resolver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698