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

Side by Side Diff: chrome/browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc

Issue 2666093002: Remove base::FundamentalValue (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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <string> 5 #include <string>
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/thread_task_runner_handle.h" 10 #include "base/threading/thread_task_runner_handle.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 service_test->ClearServices(); 93 service_test->ClearServices();
94 94
95 device_test->AddDevice(kWifiDevicePath, shill::kTypeWifi, 95 device_test->AddDevice(kWifiDevicePath, shill::kTypeWifi,
96 "stub_wifi_device1"); 96 "stub_wifi_device1");
97 97
98 service_test->AddService(kWifi1ServicePath, kWifi1ServiceGUID, "wifi1", 98 service_test->AddService(kWifi1ServicePath, kWifi1ServiceGUID, "wifi1",
99 shill::kTypeWifi, shill::kStateOnline, 99 shill::kTypeWifi, shill::kStateOnline,
100 true /* add_to_visible */); 100 true /* add_to_visible */);
101 service_test->SetServiceProperty(kWifi1ServicePath, shill::kWifiBSsid, 101 service_test->SetServiceProperty(kWifi1ServicePath, shill::kWifiBSsid,
102 base::StringValue("01:02:ab:7f:90:00")); 102 base::StringValue("01:02:ab:7f:90:00"));
103 service_test->SetServiceProperty(kWifi1ServicePath, 103 service_test->SetServiceProperty(
104 shill::kSignalStrengthProperty, 104 kWifi1ServicePath, shill::kSignalStrengthProperty, base::Value(40));
105 base::FundamentalValue(40));
106 profile_test->AddService(ShillProfileClient::GetSharedProfilePath(), 105 profile_test->AddService(ShillProfileClient::GetSharedProfilePath(),
107 kWifi1ServicePath); 106 kWifi1ServicePath);
108 107
109 content::RunAllPendingInMessageLoop(); 108 content::RunAllPendingInMessageLoop();
110 109
111 network_portal_detector_ = new NetworkPortalDetectorImpl( 110 network_portal_detector_ = new NetworkPortalDetectorImpl(
112 g_browser_process->system_request_context(), 111 g_browser_process->system_request_context(),
113 true /* create_notification_controller */); 112 true /* create_notification_controller */);
114 chromeos::network_portal_detector::InitializeForTesting( 113 chromeos::network_portal_detector::InitializeForTesting(
115 network_portal_detector_); 114 network_portal_detector_);
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 185
187 extensions::ResultCatcher catcher; 186 extensions::ResultCatcher catcher;
188 EXPECT_TRUE(catcher.GetNextResult()); 187 EXPECT_TRUE(catcher.GetNextResult());
189 188
190 // Simulate the captive portal vanishing. 189 // Simulate the captive portal vanishing.
191 SimulateSuccessfulCaptivePortalAuth(); 190 SimulateSuccessfulCaptivePortalAuth();
192 191
193 ASSERT_EQ(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE, 192 ASSERT_EQ(NetworkPortalDetector::CAPTIVE_PORTAL_STATUS_ONLINE,
194 GetCaptivePortalStatus(kWifi1ServiceGUID)); 193 GetCaptivePortalStatus(kWifi1ServiceGUID));
195 } 194 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698