Rename Origin.unique() to opaque().

content/public/common/common_param_traits.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/common/common_param_traits.h"
 
 #include <string>
 
 #include "content/public/common/content_constants.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/referrer.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_address.h"
 #include "net/base/ip_endpoint.h"
 
 namespace IPC {
 
 void ParamTraits<url::Origin>::GetSize(base::PickleSizer* s,
                                        const param_type& p) {
-  GetParamSize(s, p.unique());
+  GetParamSize(s, p.opaque());
   GetParamSize(s, p.scheme());
   GetParamSize(s, p.host());
   GetParamSize(s, p.port());
 }
 
 void ParamTraits<url::Origin>::Write(base::Pickle* m, const url::Origin& p) {
-  WriteParam(m, p.unique());
+  WriteParam(m, p.opaque());
   WriteParam(m, p.scheme());
   WriteParam(m, p.host());
   WriteParam(m, p.port());
 }
 
 bool ParamTraits<url::Origin>::Read(const base::Pickle* m,
                                     base::PickleIterator* iter,
                                     url::Origin* p) {
-  bool unique;
+  bool opaque;
   std::string scheme;
   std::string host;
   uint16_t port;
-  if (!ReadParam(m, iter, &unique) || !ReadParam(m, iter, &scheme) ||
+  if (!ReadParam(m, iter, &opaque) || !ReadParam(m, iter, &scheme) ||
       !ReadParam(m, iter, &host) || !ReadParam(m, iter, &port)) {
     *p = url::Origin();
     return false;
   }
 
-  *p = unique ? url::Origin()
+  *p = opaque ? url::Origin()
               : url::Origin::UnsafelyCreateOriginWithoutNormalization(
                     scheme, host, port);
 
-  // If a unique origin was created, but the unique flag wasn't set, then
+  // If an opaque origin was created, but the opaque flag wasn't set, then
   // the values provided to 'UnsafelyCreateOriginWithoutNormalization' were
   // invalid; kill the renderer.
-  if (!unique && p->unique())
+  if (!opaque && p->opaque())
     return false;
 
   return true;
 }
 
 void ParamTraits<url::Origin>::Log(const url::Origin& p, std::string* l) {
   l->append(p.Serialize());
 }
 
 void ParamTraits<net::HostPortPair>::GetSize(base::PickleSizer* s,
@@ skipping 131 matching lines @@
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC
 
 // Generate param traits log methods.
 #include "ipc/param_traits_log_macros.h"
 namespace IPC {
 #undef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 #include "content/public/common/common_param_traits_macros.h"
 }  // namespace IPC