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

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

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 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
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"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 ShillServiceClient::TestInterface* service_test = 96 ShillServiceClient::TestInterface* service_test =
97 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface(); 97 DBusThreadManager::Get()->GetShillServiceClient()->GetTestInterface();
98 service_test->ClearServices(); 98 service_test->ClearServices();
99 const bool add_to_visible = true; 99 const bool add_to_visible = true;
100 // Create a wifi network and set to online. 100 // Create a wifi network and set to online.
101 service_test->AddService(kWiFi1ServicePath, kWiFi1Guid, "wifi1", 101 service_test->AddService(kWiFi1ServicePath, kWiFi1Guid, "wifi1",
102 shill::kTypeWifi, shill::kStateIdle, 102 shill::kTypeWifi, shill::kStateIdle,
103 add_to_visible); 103 add_to_visible);
104 service_test->SetServiceProperty(kWiFi1ServicePath, 104 service_test->SetServiceProperty(kWiFi1ServicePath,
105 shill::kSecurityClassProperty, 105 shill::kSecurityClassProperty,
106 base::StringValue(shill::kSecurityWep)); 106 base::Value(shill::kSecurityWep));
107 service_test->SetServiceProperty( 107 service_test->SetServiceProperty(
108 kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true)); 108 kWiFi1ServicePath, shill::kConnectableProperty, base::Value(true));
109 service_test->SetServiceProperty(kWiFi1ServicePath, 109 service_test->SetServiceProperty(
110 shill::kPassphraseProperty, 110 kWiFi1ServicePath, shill::kPassphraseProperty, base::Value("failure"));
111 base::StringValue("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::MessageLoop message_loop_; 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

Powered by Google App Engine
This is Rietveld 408576698