| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <map> | 5 #include <map> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 } | 150 } |
| 151 | 151 |
| 152 virtual net::URLRequestContextGetter* GetRequestContext() const OVERRIDE { | 152 virtual net::URLRequestContextGetter* GetRequestContext() const OVERRIDE { |
| 153 return NULL; | 153 return NULL; |
| 154 } | 154 } |
| 155 | 155 |
| 156 virtual const std::string GetPlatformVersionString() const OVERRIDE { | 156 virtual const std::string GetPlatformVersionString() const OVERRIDE { |
| 157 return "Version String"; | 157 return "Version String"; |
| 158 } | 158 } |
| 159 | 159 |
| 160 virtual const std::string GetDeviceId() const OVERRIDE { | 160 virtual const std::string GetDeviceId() const { return stored_device_id_; } |
| 161 return stored_device_id_; | |
| 162 } | |
| 163 | 161 |
| 164 virtual void SaveDeviceId(const std::string& device_id) OVERRIDE {} | 162 virtual void SaveDeviceId(const std::string& device_id) {} |
| 165 | 163 |
| 166 virtual WhispernetClient* GetWhispernetClient() OVERRIDE { | 164 virtual WhispernetClient* GetWhispernetClient() OVERRIDE { |
| 167 return NULL; | 165 return NULL; |
| 168 } | 166 } |
| 169 | 167 |
| 170 protected: | 168 protected: |
| 171 // For rpc_handler_.invalid_audio_token_cache_ | 169 // For rpc_handler_.invalid_audio_token_cache_ |
| 172 base::MessageLoop message_loop_; | 170 base::MessageLoop message_loop_; |
| 173 | 171 |
| 174 RpcHandler rpc_handler_; | 172 RpcHandler rpc_handler_; |
| (...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 messages_by_subscription_["Subscription 2"][1].payload()); | 332 messages_by_subscription_["Subscription 2"][1].payload()); |
| 335 | 333 |
| 336 ASSERT_EQ(2U, directive_handler->added_directives().size()); | 334 ASSERT_EQ(2U, directive_handler->added_directives().size()); |
| 337 EXPECT_EQ("Subscription 1", | 335 EXPECT_EQ("Subscription 1", |
| 338 directive_handler->added_directives()[0].subscription_id()); | 336 directive_handler->added_directives()[0].subscription_id()); |
| 339 EXPECT_EQ("Subscription 2", | 337 EXPECT_EQ("Subscription 2", |
| 340 directive_handler->added_directives()[1].subscription_id()); | 338 directive_handler->added_directives()[1].subscription_id()); |
| 341 } | 339 } |
| 342 | 340 |
| 343 } // namespace copresence | 341 } // namespace copresence |
| OLD | NEW |