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

Unified Diff: tools/android/forwarder2/host_forwarder_main.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: tools/android/forwarder2/host_forwarder_main.cc
diff --git a/tools/android/forwarder2/host_forwarder_main.cc b/tools/android/forwarder2/host_forwarder_main.cc
index f5d8e2f85d89c6d4849b6539aff94aa9c41919d9..9aed23a316b1eba1af9f85bb12cb0334e78b1d1d 100644
--- a/tools/android/forwarder2/host_forwarder_main.cc
+++ b/tools/android/forwarder2/host_forwarder_main.cc
@@ -332,8 +332,8 @@ class ServerDelegate : public Daemon::ServerDelegate {
has_failed_ = true;
return;
}
- const Pickle command_pickle(buf, bytes_read);
- PickleIterator pickle_it(command_pickle);
+ const base::Pickle command_pickle(buf, bytes_read);
+ base::PickleIterator pickle_it(command_pickle);
std::string device_serial;
CHECK(pickle_it.ReadString(&device_serial));
int device_port;
@@ -358,10 +358,8 @@ class ServerDelegate : public Daemon::ServerDelegate {
class ClientDelegate : public Daemon::ClientDelegate {
public:
- ClientDelegate(const Pickle& command_pickle)
- : command_pickle_(command_pickle),
- has_failed_(false) {
- }
+ ClientDelegate(const base::Pickle& command_pickle)
+ : command_pickle_(command_pickle), has_failed_(false) {}
bool has_failed() const { return has_failed_; }
@@ -387,7 +385,7 @@ class ClientDelegate : public Daemon::ClientDelegate {
}
private:
- const Pickle command_pickle_;
+ const base::Pickle command_pickle_;
bool has_failed_;
};
@@ -419,7 +417,7 @@ int RunHostForwarder(int argc, char** argv) {
std::string adb_path = "adb";
bool kill_server = false;
- Pickle pickle;
+ base::Pickle pickle;
pickle.WriteString(
cmd_line.HasSwitch("serial-id") ?
cmd_line.GetSwitchValueASCII("serial-id") : std::string());
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/message_pipe_perftest.cc ('k') | ui/base/clipboard/custom_data_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698