[IC] Rename image_fetcher/core/storage --> image_fetcher/core/cache

Follow-up from previous histogram CL:
https://chromium-review.googlesource.com/c/chromium/src/+/1250061/5
comments in cached_image_fetcher.h.

TBR=gab@chromium.org,nyquist@chromium.org

Bug: 888712
Change-Id: I8efa7f81a7ccf475f518b12516ea116837518586
Reviewed-on: https://chromium-review.googlesource.com/c/1285125
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Sky Malice <skym@chromium.org>
Cr-Commit-Position: refs/heads/master@{#600840}

chrome/browser/cached_image_fetcher/cached_image_fetcher_service_factory.cc

@@ -14,10 +14,10 @@
 #include "build/build_config.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search/suggestions/image_decoder_impl.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
+#include "components/image_fetcher/core/cache/image_data_store_disk.h"
+#include "components/image_fetcher/core/cache/image_metadata_store_leveldb.h"
 #include "components/image_fetcher/core/cached_image_fetcher_service.h"
-#include "components/image_fetcher/core/storage/image_cache.h"
-#include "components/image_fetcher/core/storage/image_data_store_disk.h"
-#include "components/image_fetcher/core/storage/image_metadata_store_leveldb.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/storage_partition.h"

chrome/browser/prefs/browser_prefs.cc

@@ -85,7 +85,7 @@
 #include "components/feature_engagement/buildflags.h"
 #include "components/flags_ui/pref_service_flags_storage.h"
 #include "components/gcm_driver/gcm_channel_status_syncer.h"
-#include "components/image_fetcher/core/storage/image_cache.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
 #include "components/invalidation/impl/invalidator_registrar_with_memory.h"
 #include "components/invalidation/impl/per_user_topic_registration_manager.h"
 #include "components/language/content/browser/geo_language_provider.h"

components/image_fetcher/core/BUILD.gn

@@ -19,7 +19,7 @@ static_library("core") {
     "request_metadata.h",
   ]
   deps = [
-    "storage",
+    "cache",
   ]
   public_deps = [
     "//base",
@@ -63,9 +63,9 @@ source_set("unit_tests") {
   deps = [
     ":core",
     ":test_support",
-    "storage",
-    "storage:storage_unit_tests",
-    "storage/proto",
+    "cache",
+    "cache:cache_unit_tests",
+    "cache/proto",
     "//components/leveldb_proto:test_support",
     "//components/prefs:test_support",
     "//net",

components/image_fetcher/core/storage/BUILD.gn → components/image_fetcher/core/cache/BUILD.gn

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-static_library("storage") {
+static_library("cache") {
   sources = [
     "image_cache.cc",
     "image_cache.h",
@@ -26,7 +26,7 @@ static_library("storage") {
   ]
 }
 
-source_set("storage_unit_tests") {
+source_set("cache_unit_tests") {
   testonly = true
   sources = [
     "image_cache_unittest.cc",
@@ -34,7 +34,7 @@ source_set("storage_unit_tests") {
     "image_metadata_store_leveldb_unittest.cc",
   ]
   deps = [
-    ":storage",
+    ":cache",
     "proto",
     "//base",
     "//base/test:test_support",

components/image_fetcher/core/storage/image_cache.cc → components/image_fetcher/core/cache/image_cache.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_cache.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
 
 #include <algorithm>
 #include <utility>
@@ -15,8 +15,8 @@
 #include "base/time/clock.h"
 #include "base/time/time.h"
 #include "components/base32/base32.h"
-#include "components/image_fetcher/core/storage/image_data_store.h"
-#include "components/image_fetcher/core/storage/image_metadata_store.h"
+#include "components/image_fetcher/core/cache/image_data_store.h"
+#include "components/image_fetcher/core/cache/image_metadata_store.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 
@@ -129,7 +129,7 @@ void ImageCache::OnDependencyInitialized() {
   queued_requests_.clear();
 
   // TODO(wylieb): Consider delaying eviction as new requests come in via
-  // seperate weak pointers.
+  // separate weak pointers.
   // TODO(wylieb): Log UMA data about starting GC eviction here, then again
   // when it's finished.
   // Once all the queued requests are taken care of, run eviction.

components/image_fetcher/core/storage/image_cache.h → components/image_fetcher/core/cache/image_cache.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_CACHE_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_CACHE_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_CACHE_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_CACHE_H_
 
 #include <memory>
 #include <string>
@@ -11,7 +11,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
-#include "components/image_fetcher/core/storage/image_store_types.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
 
 class PrefRegistrySimple;
 class PrefService;
@@ -111,4 +111,4 @@ class ImageCache : public base::RefCounted<ImageCache> {
 
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_CACHE_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_CACHE_H_

components/image_fetcher/core/storage/image_cache_unittest.cc → components/image_fetcher/core/cache/image_cache_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_cache.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
 
 #include <map>
 #include <utility>
@@ -12,9 +12,9 @@
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "base/threading/sequenced_task_runner_handle.h"
-#include "components/image_fetcher/core/storage/image_data_store_disk.h"
-#include "components/image_fetcher/core/storage/image_metadata_store_leveldb.h"
-#include "components/image_fetcher/core/storage/proto/cached_image_metadata.pb.h"
+#include "components/image_fetcher/core/cache/image_data_store_disk.h"
+#include "components/image_fetcher/core/cache/image_metadata_store_leveldb.h"
+#include "components/image_fetcher/core/cache/proto/cached_image_metadata.pb.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "components/prefs/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"

components/image_fetcher/core/storage/image_data_store.h → components/image_fetcher/core/cache/image_data_store.h

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_H_
 
 #include <string>
 
-#include "components/image_fetcher/core/storage/image_store_types.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
 
 namespace image_fetcher {
 
@@ -42,4 +42,4 @@ class ImageDataStore {
 };
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_H_

components/image_fetcher/core/storage/image_data_store_disk.cc → components/image_fetcher/core/cache/image_data_store_disk.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_data_store_disk.h"
+#include "components/image_fetcher/core/cache/image_data_store_disk.h"
 
 #include <utility>
 #include <vector>

components/image_fetcher/core/storage/image_data_store_disk.h → components/image_fetcher/core/cache/image_data_store_disk.h

@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_DISK_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_DISK_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_DISK_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_DISK_H_
 
 #include <string>
 
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "components/image_fetcher/core/storage/image_data_store.h"
-#include "components/image_fetcher/core/storage/image_store_types.h"
+#include "components/image_fetcher/core/cache/image_data_store.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -57,4 +57,4 @@ class ImageDataStoreDisk : public ImageDataStore {
 };
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_DATA_STORE_DISK_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_DATA_STORE_DISK_H_

components/image_fetcher/core/storage/image_data_store_disk_unittest.cc → components/image_fetcher/core/cache/image_data_store_disk_unittest.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_data_store_disk.h"
+#include "components/image_fetcher/core/cache/image_data_store_disk.h"
 
 #include <memory>
 #include <vector>

components/image_fetcher/core/storage/image_metadata_store.h → components/image_fetcher/core/cache/image_metadata_store.h

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_H_
 
 #include <string>
 
 #include "base/time/time.h"
-#include "components/image_fetcher/core/storage/image_store_types.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
 
 namespace image_fetcher {
 
@@ -59,4 +59,4 @@ class ImageMetadataStore {
 };
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_H_

components/image_fetcher/core/storage/image_metadata_store_leveldb.cc → components/image_fetcher/core/cache/image_metadata_store_leveldb.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_metadata_store_leveldb.h"
+#include "components/image_fetcher/core/cache/image_metadata_store_leveldb.h"
 
 #include <algorithm>
 #include <utility>
@@ -11,7 +11,7 @@
 #include "base/sequenced_task_runner.h"
 #include "base/time/clock.h"
 #include "base/time/time.h"
-#include "components/image_fetcher/core/storage/proto/cached_image_metadata.pb.h"
+#include "components/image_fetcher/core/cache/proto/cached_image_metadata.pb.h"
 #include "components/leveldb_proto/proto_database_impl.h"
 
 using image_fetcher::CachedImageMetadataProto;

components/image_fetcher/core/storage/image_metadata_store_leveldb.h → components/image_fetcher/core/cache/image_metadata_store_leveldb.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_LEVELDB_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_LEVELDB_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_LEVELDB_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_LEVELDB_H_
 
 #include <memory>
 #include <string>
@@ -11,8 +11,8 @@
 
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
-#include "components/image_fetcher/core/storage/image_metadata_store.h"
-#include "components/image_fetcher/core/storage/image_store_types.h"
+#include "components/image_fetcher/core/cache/image_metadata_store.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
 #include "components/leveldb_proto/proto_database.h"
 
 namespace base {
@@ -94,4 +94,4 @@ class ImageMetadataStoreLevelDB : public ImageMetadataStore {
 
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_METADATA_STORE_LEVELDB_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_METADATA_STORE_LEVELDB_H_

components/image_fetcher/core/storage/image_metadata_store_leveldb_unittest.cc → components/image_fetcher/core/cache/image_metadata_store_leveldb_unittest.cc

@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/image_fetcher/core/storage/image_metadata_store_leveldb.h"
+#include "components/image_fetcher/core/cache/image_metadata_store_leveldb.h"
 
 #include <map>
 #include <utility>
 
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
-#include "components/image_fetcher/core/storage/image_store_types.h"
-#include "components/image_fetcher/core/storage/proto/cached_image_metadata.pb.h"
+#include "components/image_fetcher/core/cache/image_store_types.h"
+#include "components/image_fetcher/core/cache/proto/cached_image_metadata.pb.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"

components/image_fetcher/core/storage/image_store_types.h → components/image_fetcher/core/cache/image_store_types.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_STORE_TYPES_H_
-#define COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_STORE_TYPES_H_
+#ifndef COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_STORE_TYPES_H_
+#define COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_STORE_TYPES_H_
 
 #include <string>
 #include <vector>
@@ -31,4 +31,4 @@ using KeysCallback = base::OnceCallback<void(std::vector<std::string>)>;
 
 }  // namespace image_fetcher
 
-#endif  // COMPONENTS_IMAGE_FETCHER_CORE_STORAGE_IMAGE_STORE_TYPES_H_
+#endif  // COMPONENTS_IMAGE_FETCHER_CORE_CACHE_IMAGE_STORE_TYPES_H_

components/image_fetcher/core/cached_image_fetcher.cc

@@ -9,9 +9,9 @@
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/timer/elapsed_timer.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
 #include "components/image_fetcher/core/image_decoder.h"
 #include "components/image_fetcher/core/request_metadata.h"
-#include "components/image_fetcher/core/storage/image_cache.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"

components/image_fetcher/core/cached_image_fetcher_service.cc

@@ -7,10 +7,10 @@
 #include <utility>
 
 #include "base/time/clock.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
 #include "components/image_fetcher/core/cached_image_fetcher.h"
 #include "components/image_fetcher/core/image_decoder.h"
 #include "components/image_fetcher/core/image_fetcher_impl.h"
-#include "components/image_fetcher/core/storage/image_cache.h"
 #include "services/network/public/cpp/shared_url_loader_factory.h"
 
 namespace image_fetcher {

components/image_fetcher/core/cached_image_fetcher_unittest.cc

@@ -18,13 +18,13 @@
 #include "base/test/scoped_task_environment.h"
 #include "base/test/simple_test_clock.h"
 #include "base/threading/sequenced_task_runner_handle.h"
+#include "components/image_fetcher/core/cache/image_cache.h"
+#include "components/image_fetcher/core/cache/image_data_store_disk.h"
+#include "components/image_fetcher/core/cache/image_metadata_store_leveldb.h"
+#include "components/image_fetcher/core/cache/proto/cached_image_metadata.pb.h"
 #include "components/image_fetcher/core/fake_image_decoder.h"
 #include "components/image_fetcher/core/image_fetcher_impl.h"
 #include "components/image_fetcher/core/image_fetcher_types.h"
-#include "components/image_fetcher/core/storage/image_cache.h"
-#include "components/image_fetcher/core/storage/image_data_store_disk.h"
-#include "components/image_fetcher/core/storage/image_metadata_store_leveldb.h"
-#include "components/image_fetcher/core/storage/proto/cached_image_metadata.pb.h"
 #include "components/leveldb_proto/testing/fake_db.h"
 #include "components/prefs/testing_pref_service.h"
 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h"