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 "chrome/browser/push_messaging/push_messaging_app_identifier.h" | 5 #include "chrome/browser/push_messaging/push_messaging_app_identifier.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include "base/guid.h" | 9 #include "base/guid.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 19 matching lines...) Expand all Loading... |
30 | 30 |
31 std::string MakePrefValue(const GURL& origin, | 31 std::string MakePrefValue(const GURL& origin, |
32 int64_t service_worker_registration_id) { | 32 int64_t service_worker_registration_id) { |
33 return origin.spec() + kSeparator | 33 return origin.spec() + kSeparator |
34 + base::Int64ToString(service_worker_registration_id); | 34 + base::Int64ToString(service_worker_registration_id); |
35 } | 35 } |
36 | 36 |
37 bool GetOriginAndSWRFromPrefValue( | 37 bool GetOriginAndSWRFromPrefValue( |
38 const std::string& pref_value, GURL* origin, | 38 const std::string& pref_value, GURL* origin, |
39 int64_t* service_worker_registration_id) { | 39 int64_t* service_worker_registration_id) { |
40 std::vector<std::string> parts; | 40 std::vector<std::string> parts = base::SplitString( |
41 base::SplitString(pref_value, kSeparator, &parts); | 41 pref_value, std::string(1, kSeparator), |
| 42 base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); |
42 if (parts.size() != 2) | 43 if (parts.size() != 2) |
43 return false; | 44 return false; |
44 | 45 |
45 if (!base::StringToInt64(parts[1], service_worker_registration_id)) | 46 if (!base::StringToInt64(parts[1], service_worker_registration_id)) |
46 return false; | 47 return false; |
47 | 48 |
48 *origin = GURL(parts[0]); | 49 *origin = GURL(parts[0]); |
49 return origin->is_valid(); | 50 return origin->is_valid(); |
50 } | 51 } |
51 | 52 |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
200 const size_t suffix_length = 1 /* kSeparator */ + kGuidLength; | 201 const size_t suffix_length = 1 /* kSeparator */ + kGuidLength; |
201 DCHECK(app_id_.size() > kPrefixLength + suffix_length); | 202 DCHECK(app_id_.size() > kPrefixLength + suffix_length); |
202 DCHECK_EQ(origin_, GURL(app_id_.substr( | 203 DCHECK_EQ(origin_, GURL(app_id_.substr( |
203 kPrefixLength, app_id_.size() - kPrefixLength - suffix_length))); | 204 kPrefixLength, app_id_.size() - kPrefixLength - suffix_length))); |
204 DCHECK_EQ(std::string(1, kSeparator), | 205 DCHECK_EQ(std::string(1, kSeparator), |
205 app_id_.substr(app_id_.size() - suffix_length, 1)); | 206 app_id_.substr(app_id_.size() - suffix_length, 1)); |
206 } | 207 } |
207 // GUID | 208 // GUID |
208 DCHECK(base::IsValidGUID(app_id_.substr(app_id_.size() - kGuidLength))); | 209 DCHECK(base::IsValidGUID(app_id_.substr(app_id_.size() - kGuidLength))); |
209 } | 210 } |
OLD | NEW |