rename loader

brave · May 5, 2020 · 5f03c67 · 5f03c67
1 parent 4d1d071
commit 5f03c67
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/components/speedreader/BUILD.gn b/components/speedreader/BUILD.gn
@@ -15,8 +15,6 @@ source_set("speedreader") {
   ]
 
   sources = [
-    "speedreader_loader.cc",
-    "speedreader_loader.h",
     "speedreader_pref_names.h",
     "speedreader_service.cc",
     "speedreader_service.h",
@@ -25,6 +23,8 @@ source_set("speedreader") {
     "speedreader_test_whitelist.h",
     "speedreader_throttle.cc",
     "speedreader_throttle.h",
+    "speedreader_url_loader.cc",
+    "speedreader_url_loader.h",
     "speedreader_whitelist.cc",
     "speedreader_whitelist.h",
   ]

diff --git a/components/speedreader/speedreader_throttle.cc b/components/speedreader/speedreader_throttle.cc
@@ -7,7 +7,8 @@
 
 #include <utility>
 
-#include "brave/components/speedreader/speedreader_loader.h"
+#include "brave/components/speedreader/speedreader_url_loader.h"
+#include "brave/components/speedreader/speedreader_whitelist.h"
 #include "mojo/public/cpp/bindings/pending_receiver.h"
 #include "mojo/public/cpp/bindings/pending_remote.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"

diff --git a/components/speedreader/speedreader_throttle.h b/components/speedreader/speedreader_throttle.h
@@ -7,13 +7,13 @@
 #define BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_THROTTLE_H_
 
 #include "base/memory/weak_ptr.h"
-#include "brave/components/speedreader/speedreader_switches.h"
-#include "brave/components/speedreader/speedreader_whitelist.h"
 #include "services/network/public/mojom/url_response_head.mojom-forward.h"
 #include "third_party/blink/public/common/loader/url_loader_throttle.h"
 
 namespace speedreader {
 
+class SpeedreaderWhitelist;
+
 // Launches the speedreader distillation pass over a reponce body, deferring
 // the load until distillation is done.
 // TODO(iefremov): Avoid distilling the same page twice (see comments in

diff --git a/components/speedreader/speedreader_loader.cc → ...nts/speedreader/speedreader_url_loader.cc b/components/speedreader/speedreader_loader.cc → ...nts/speedreader/speedreader_url_loader.cc
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "brave/components/speedreader/speedreader_loader.h"
+#include "brave/components/speedreader/speedreader_url_loader.h"
 
 #include <memory>
 #include <string>
@@ -14,6 +14,7 @@
 #include "base/task/post_task.h"
 #include "brave/components/speedreader/rust/ffi/speedreader.h"
 #include "brave/components/speedreader/speedreader_throttle.h"
+#include "brave/components/speedreader/speedreader_whitelist.h"
 #include "components/grit/brave_components_resources.h"
 #include "mojo/public/cpp/bindings/self_owned_receiver.h"
 #include "services/network/public/mojom/url_response_head.mojom.h"

diff --git a/components/speedreader/speedreader_loader.h → ...ents/speedreader/speedreader_url_loader.h b/components/speedreader/speedreader_loader.h → ...ents/speedreader/speedreader_url_loader.h
@@ -3,8 +3,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#ifndef BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_LOADER_H_
-#define BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_LOADER_H_
+#ifndef BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_URL_LOADER_H_
+#define BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_URL_LOADER_H_
 
 #include <string>
 #include <tuple>
@@ -154,4 +154,4 @@ class SpeedReaderURLLoader : public network::mojom::URLLoaderClient,
 
 }  // namespace speedreader
 
-#endif  // BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_LOADER_H_
+#endif  // BRAVE_COMPONENTS_SPEEDREADER_SPEEDREADER_URL_LOADER_H_