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

Side by Side Diff: chromeos/dbus/shill_ipconfig_client_unittest.cc

Issue 2843813002: Remove SetWithoutPathExpansion (Closed)
Patch Set: Fix CrOS Error 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
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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chromeos/dbus/shill_client_unittest_base.h" 10 #include "chromeos/dbus/shill_client_unittest_base.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 array_writer.CloseContainer(&entry_writer); 98 array_writer.CloseContainer(&entry_writer);
99 // Append MTU. 99 // Append MTU.
100 array_writer.OpenDictEntry(&entry_writer); 100 array_writer.OpenDictEntry(&entry_writer);
101 entry_writer.AppendString(shill::kMtuProperty); 101 entry_writer.AppendString(shill::kMtuProperty);
102 entry_writer.AppendVariantOfInt32(kMtu); 102 entry_writer.AppendVariantOfInt32(kMtu);
103 array_writer.CloseContainer(&entry_writer); 103 array_writer.CloseContainer(&entry_writer);
104 writer.CloseContainer(&array_writer); 104 writer.CloseContainer(&array_writer);
105 105
106 // Create the expected value. 106 // Create the expected value.
107 base::DictionaryValue value; 107 base::DictionaryValue value;
108 value.SetWithoutPathExpansion(shill::kAddressProperty, 108 value.SetStringWithoutPathExpansion(shill::kAddressProperty, kAddress);
109 new base::Value(kAddress)); 109 value.SetIntegerWithoutPathExpansion(shill::kMtuProperty, kMtu);
110 value.SetWithoutPathExpansion(shill::kMtuProperty, new base::Value(kMtu));
111 110
112 // Set expectations. 111 // Set expectations.
113 PrepareForMethodCall(shill::kGetPropertiesFunction, 112 PrepareForMethodCall(shill::kGetPropertiesFunction,
114 base::Bind(&ExpectNoArgument), 113 base::Bind(&ExpectNoArgument),
115 response.get()); 114 response.get());
116 // Call method. 115 // Call method.
117 client_->GetProperties(dbus::ObjectPath(kExampleIPConfigPath), 116 client_->GetProperties(dbus::ObjectPath(kExampleIPConfigPath),
118 base::Bind(&ExpectDictionaryValueResult, &value)); 117 base::Bind(&ExpectDictionaryValueResult, &value));
119 // Run the message loop. 118 // Run the message loop.
120 base::RunLoop().RunUntilIdle(); 119 base::RunLoop().RunUntilIdle();
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 response.get()); 168 response.get());
170 // Call method. 169 // Call method.
171 client_->Remove(dbus::ObjectPath(kExampleIPConfigPath), 170 client_->Remove(dbus::ObjectPath(kExampleIPConfigPath),
172 base::Bind(&ExpectNoResultValue)); 171 base::Bind(&ExpectNoResultValue));
173 172
174 // Run the message loop. 173 // Run the message loop.
175 base::RunLoop().RunUntilIdle(); 174 base::RunLoop().RunUntilIdle();
176 } 175 }
177 176
178 } // namespace chromeos 177 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/dbus/shill_device_client_unittest.cc ('k') | chromeos/dbus/shill_manager_client_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698