summaryrefslogtreecommitdiffstats
path: root/components/enhanced_bookmarks/proto
diff options
context:
space:
mode:
authorsorin <sorin@chromium.org>2014-10-07 18:06:56 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-08 01:07:24 +0000
commit67861504c4cf1b53c7f03662384e58b92772a434 (patch)
treef87503f288f6a88b344e6f9dd8f7f680ce18b3af /components/enhanced_bookmarks/proto
parent4e645e9bc69350f9799262584ad8b82255d0dd8e (diff)
downloadchromium_src-67861504c4cf1b53c7f03662384e58b92772a434.zip
chromium_src-67861504c4cf1b53c7f03662384e58b92772a434.tar.gz
chromium_src-67861504c4cf1b53c7f03662384e58b92772a434.tar.bz2
Revert of Bring up of the enhanced bookmarks cluster service. (patchset #13 id:320001 of https://codereview.chromium.org/539173004/)
Reason for revert: This CL added static initializers which broke the sizes bots on Mac, Linux, and Linux x64. Before the change: # Static initializers in src/out/Release/chrome: # HINT: To get this list, run tools/linux/dump_static_initializers.py # HINT: diff against the log from the last run to see what changed # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x65 # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xaa # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x6b # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xc2 # atomicops_internals_x86_gcc.cc google::protobuf::internal::AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc google::protobuf::internal::AtomicOps_Internalx86CPUFeatures+0x1 # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x65 # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xaa # atomicops_internals_x86_gcc.cc v8::base::AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # debugallocation_shim.cc module_enter_exit_hook # debugallocation_shim.cc (anonymous namespace)::large_alloc_threshold # debugallocation_shim.cc TCMallocGuard::TCMallocGuard() # debugallocation_shim.cc __cxa_atexit@plt [registers a dtor to run at exit] # debugallocation_shim.cc __init_array_end+0x3538 # debugallocation_shim.cc __init_array_end+0x3540 # debugallocation_shim.cc __init_array_end+0x3548 # memory_region_map.cc libpthread_initialized # spinlock.cc _GLOBAL__sub_I_spinlock.cc+0x12 # spinlock.cc NumCPUs() # spinlock.cc adaptive_spin_count # spinlock_internal.cc _GLOBAL__sub_I_spinlock_internal.cc+0x79 # spinlock_internal.cc have_futex # spinlock_internal.cc futex_private_flag # spinlock_internal.cc syscall@plt # Found 34 static initializers in 7 files. After the change: # Static initializers in src/out/Release/chrome: # HINT: To get this list, run tools/linux/dump_static_initializers.py # HINT: diff against the log from the last run to see what changed # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x65 # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xaa # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x6b # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xc2 # atomicops_internals_x86_gcc.cc google::protobuf::internal::AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc google::protobuf::internal::AtomicOps_Internalx86CPUFeatures+0x1 # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # atomicops_internals_x86_gcc.cc .L.str # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0x65 # atomicops_internals_x86_gcc.cc _GLOBAL__sub_I_atomicops_internals_x86_gcc.cc+0xaa # atomicops_internals_x86_gcc.cc v8::base::AtomicOps_Internalx86CPUFeatures # atomicops_internals_x86_gcc.cc __stack_chk_fail@plt # atomicops_internals_x86_gcc.cc strcmp@plt # bookmark_server_cluster_service.cc .L.str # bookmark_server_cluster_service.cc (anonymous namespace)::kClusterUrl # bookmark_server_cluster_service.cc std::basic_string<char, std::char_traits<char>, std::allocator<char> >::basic_string(char const*, std::allocator<char> const&)@plt # bookmark_server_cluster_service.cc __cxa_atexit@plt [registers a dtor to run at exit] # bookmark_server_cluster_service.cc __init_array_end+0x3540 # bookmark_server_cluster_service.cc __init_array_end+0xe220 # debugallocation_shim.cc module_enter_exit_hook # debugallocation_shim.cc (anonymous namespace)::large_alloc_threshold # debugallocation_shim.cc TCMallocGuard::TCMallocGuard() # debugallocation_shim.cc __cxa_atexit@plt [registers a dtor to run at exit] # debugallocation_shim.cc __init_array_end+0x3538 # debugallocation_shim.cc __init_array_end+0x3540 # debugallocation_shim.cc __init_array_end+0x3548 # memory_region_map.cc libpthread_initialized # spinlock.cc _GLOBAL__sub_I_spinlock.cc+0x12 # spinlock.cc NumCPUs() # spinlock.cc adaptive_spin_count # spinlock_internal.cc _GLOBAL__sub_I_spinlock_internal.cc+0x79 # spinlock_internal.cc have_futex # spinlock_internal.cc futex_private_flag # spinlock_internal.cc syscall@plt # Found 40 static initializers in 8 files. See this bot, as an example: https://build.chromium.org/p/chromium/builders/Linux%20x64/builds/71728/steps/sizes/logs/stdio In addition to this, the CL declares a static instance of std::string which is not allowed. The S string constants also should be declared as const char kPrefServiceVersionKey[] = "version" for example. Original issue's description: > Bring up of the enhanced bookmarks cluster service. > > This service retrieves the cluster of bookmarks from the bookmark > server. > > BUG=None > > Committed: https://crrev.com/6bb374fc58bfeeb7966b6a548b1c7b41af9c8e47 > Cr-Commit-Position: refs/heads/master@{#298582} TBR=blundell@chromium.org,yfriedman@chromium.org,mcolbert@chromium.org,kkimlabs@chromium.org,battre@chromium.org,zea@chromium.org,sky@chromium.org,noyau@chromium.org NOTREECHECKS=true NOTRY=true BUG=None Review URL: https://codereview.chromium.org/641473002 Cr-Commit-Position: refs/heads/master@{#298629}
Diffstat (limited to 'components/enhanced_bookmarks/proto')
-rw-r--r--components/enhanced_bookmarks/proto/BUILD.gn1
-rw-r--r--components/enhanced_bookmarks/proto/cluster.proto34
2 files changed, 0 insertions, 35 deletions
diff --git a/components/enhanced_bookmarks/proto/BUILD.gn b/components/enhanced_bookmarks/proto/BUILD.gn
index 579884a..f6e932d 100644
--- a/components/enhanced_bookmarks/proto/BUILD.gn
+++ b/components/enhanced_bookmarks/proto/BUILD.gn
@@ -6,7 +6,6 @@ import("//third_party/protobuf/proto_library.gni")
proto_library("proto") {
sources = [
- "cluster.proto",
"metadata.proto",
"search.proto",
]
diff --git a/components/enhanced_bookmarks/proto/cluster.proto b/components/enhanced_bookmarks/proto/cluster.proto
deleted file mode 100644
index 9901541..0000000
--- a/components/enhanced_bookmarks/proto/cluster.proto
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 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.
-//
-syntax = "proto2";
-option optimize_for = LITE_RUNTIME;
-
-package image_collections;
-
-message ClusterRequest {
- // Optional list of docs we want to cluster--a subset of the user's available
- // docs.
- repeated string docs = 1;
-
- // When docs is empty, used to determine which clips are clustered. If set to
- // true, cluster all the user's clips. Otherwise (default) cluster all of the
- // user's uncategorized clips.
- optional bool cluster_all = 3 [default = false];
-
- extensions 2;
-}
-
-message ClusterResponse {
- message Cluster {
- repeated string docs = 1;
- // May be empty or unset if no reasonable title could be found.
- optional string title = 2;
- }
-
- // Each of ClusterRequest.docs will exist in exactly one cluster. Some
- // clusters may be singletons, so
- // ClusterResponse.clusters_size() <= ClusterRequest.docs_size().
- repeated Cluster clusters = 1;
-}