Refactor dom_distiller content/ to content/browser

This change moves the files in the root content folder to a new
browser folder. This is to help differentiate future code that
will run on the renderer.

BUG=

Review URL: https://codereview.chromium.org/1227123002

Cr-Commit-Position: refs/heads/master@{#339927}

34 files changed, 90 insertions, 90 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 7ef02ed..383c493 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -257,7 +257,7 @@ source_set("browser") {
       "//components/data_reduction_proxy/content/browser",
       "//components/devtools_discovery",
       "//components/devtools_http_handler",
-      "//components/dom_distiller/content",
+      "//components/dom_distiller/content:content_browser",
       "//components/favicon/content",
       "//components/history/content/browser",
       "//components/keyed_service/content",
diff --git a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
index 9c4ea3e..a5a6d91 100644
--- a/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_service_factory.cc
@@ -7,7 +7,7 @@
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile.h"
-#include "components/dom_distiller/content/distiller_page_web_contents.h"
+#include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distiller.h"
 #include "components/dom_distiller/core/dom_distiller_store.h"
diff --git a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
index 0dd5cc5..4ca2fc8 100644
--- a/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
+++ b/chrome/browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc
@@ -15,8 +15,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/dom_distiller_viewer_source.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/distiller.h"
diff --git a/chrome/browser/dom_distiller/profile_utils.cc b/chrome/browser/dom_distiller/profile_utils.cc
index 7ae2e49..80f6d7f 100644
--- a/chrome/browser/dom_distiller/profile_utils.cc
+++ b/chrome/browser/dom_distiller/profile_utils.cc
@@ -11,8 +11,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_isolated_world_ids.h"
 #include "chrome/common/chrome_switches.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/dom_distiller_viewer_source.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 #include "components/dom_distiller/core/external_feedback_reporter.h"
 #include "components/dom_distiller/core/url_constants.h"
 
diff --git a/chrome/browser/dom_distiller/tab_utils.cc b/chrome/browser/dom_distiller/tab_utils.cc
index 06e0ee2..fda3c8d 100644
--- a/chrome/browser/dom_distiller/tab_utils.cc
+++ b/chrome/browser/dom_distiller/tab_utils.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/dom_distiller/dom_distiller_service_factory.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
-#include "components/dom_distiller/content/distiller_page_web_contents.h"
+#include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/task_tracker.h"
diff --git a/chrome/browser/dom_distiller/tab_utils_browsertest.cc b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
index b2f65c3..4de6dfa 100644
--- a/chrome/browser/dom_distiller/tab_utils_browsertest.cc
+++ b/chrome/browser/dom_distiller/tab_utils_browsertest.cc
@@ -13,8 +13,8 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
 #include "components/dom_distiller/core/task_tracker.h"
 #include "components/dom_distiller/core/url_constants.h"
diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc
index 9148e04..7668090 100644
--- a/chrome/browser/ui/tab_helpers.cc
+++ b/chrome/browser/ui/tab_helpers.cc
@@ -40,7 +40,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "components/autofill/content/browser/content_autofill_driver_factory.h"
 #include "components/autofill/core/browser/autofill_manager.h"
-#include "components/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/history/content/browser/web_contents_top_sites_observer.h"
 #include "components/history/core/browser/top_sites.h"
 #include "components/password_manager/core/browser/password_manager.h"
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e715d55..cdd46e4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3267,7 +3267,7 @@
             '../components/components.gyp:data_reduction_proxy_content_browser',
             '../components/components.gyp:devtools_discovery',
             '../components/components.gyp:devtools_http_handler',
-            '../components/components.gyp:dom_distiller_content',
+            '../components/components.gyp:dom_distiller_content_browser',
             '../components/components.gyp:favicon_content',
             '../components/components.gyp:guest_view_browser',
             '../components/components.gyp:history_content_browser',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 39281b4..9de0536 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2033,7 +2033,7 @@
         '../components/components.gyp:autofill_content_risk_proto',
         '../components/components.gyp:autofill_content_test_support',
         '../components/components.gyp:captive_portal_test_support',
-        '../components/components.gyp:dom_distiller_content',
+        '../components/components.gyp:dom_distiller_content_browser',
         '../components/components.gyp:dom_distiller_test_support',
         '../components/components.gyp:guest_view_test_support',
         '../components/components.gyp:translate_core_common',
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 6f75599..68ba535 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -568,7 +568,7 @@ if (!is_android) {
       "//components/autofill/content/browser/wallet:test_support",
       "//components/autofill/content/renderer:test_support",
       "//components/captive_portal:test_support",
-      "//components/dom_distiller/content",
+      "//components/dom_distiller/content:content_browser",
       "//components/dom_distiller/core:test_support",
       "//components/guest_view/browser:test_support",
       "//components/resources",
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 05250f4..a869cf9 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -380,8 +380,8 @@ test("components_browsertests") {
   sources = [
     "autofill/content/browser/risk/fingerprint_browsertest.cc",
     "autofill/content/renderer/password_form_conversion_utils_browsertest.cc",
-    "dom_distiller/content/distillable_page_utils_browsertest.cc",
-    "dom_distiller/content/distiller_page_web_contents_browsertest.cc",
+    "dom_distiller/content/browser/distillable_page_utils_browsertest.cc",
+    "dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc",
     "password_manager/content/renderer/credential_manager_client_browsertest.cc",
   ]
 
@@ -391,7 +391,7 @@ test("components_browsertests") {
     "autofill/content/browser",
     "autofill/content/renderer",
     "content_settings/core/common",
-    "dom_distiller/content",
+    "dom_distiller/content:content_browser",
     "dom_distiller/core",
     "dom_distiller/core:test_support",
     "password_manager/content/browser",
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index 36e465c..75221d1 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -144,8 +144,8 @@
       'devtools_http_handler/devtools_http_handler_unittest.cc',
     ],
     'dom_distiller_unittest_sources': [
-      'dom_distiller/content/dom_distiller_viewer_source_unittest.cc',
-      'dom_distiller/content/web_contents_main_frame_observer_unittest.cc',
+      'dom_distiller/content/browser/dom_distiller_viewer_source_unittest.cc',
+      'dom_distiller/content/browser/web_contents_main_frame_observer_unittest.cc',
       'dom_distiller/core/article_entry_unittest.cc',
       'dom_distiller/core/distillable_page_detector_unittest.cc',
       'dom_distiller/core/distilled_content_store_unittest.cc',
@@ -951,7 +951,7 @@
             'components.gyp:autofill_content_test_support',
             'components.gyp:data_reduction_proxy_content_browser',
             'components.gyp:devtools_http_handler',
-            'components.gyp:dom_distiller_content',
+            'components.gyp:dom_distiller_content_browser',
             'components.gyp:error_page_renderer',
             'components.gyp:favicon_content',
             'components.gyp:guest_view_browser',
@@ -1386,7 +1386,7 @@
             'components.gyp:autofill_content_renderer',
             'components.gyp:content_settings_core_browser',
             'components.gyp:content_settings_core_common',
-            'components.gyp:dom_distiller_content',
+            'components.gyp:dom_distiller_content_browser',
             'components.gyp:dom_distiller_core',
             'components.gyp:password_manager_content_renderer',
             'components.gyp:pref_registry_test_support',
@@ -1403,9 +1403,9 @@
           'sources': [
             'autofill/content/browser/risk/fingerprint_browsertest.cc',
             'autofill/content/renderer/password_form_conversion_utils_browsertest.cc',
-            'dom_distiller/content/distillable_page_utils_browsertest.cc',
-            'dom_distiller/content/distiller_page_web_contents_browsertest.cc',
-            'dom_distiller/content/test/dom_distiller_js_browsertest.cc',
+            'dom_distiller/content/browser/distillable_page_utils_browsertest.cc',
+            'dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc',
+            'dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc',
             'password_manager/content/renderer/credential_manager_client_browsertest.cc',
           ],
           'conditions': [
diff --git a/components/dom_distiller.gypi b/components/dom_distiller.gypi
index 157e6be..ea4a750 100644
--- a/components/dom_distiller.gypi
+++ b/components/dom_distiller.gypi
@@ -164,8 +164,8 @@
     ['OS != "ios"', {
       'targets': [
         {
-          # GN version: //components/dom_distiller/content
-          'target_name': 'dom_distiller_content',
+          # GN version: //components/dom_distiller/content:content_browser
+          'target_name': 'dom_distiller_content_browser',
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
@@ -184,18 +184,18 @@
             '..',
           ],
           'sources': [
-            'dom_distiller/content/distillable_page_utils.cc',
-            'dom_distiller/content/distillable_page_utils.h',
-            'dom_distiller/content/distillable_page_utils_android.cc',
-            'dom_distiller/content/distillable_page_utils_android.h',
-            'dom_distiller/content/distiller_javascript_utils.cc',
-            'dom_distiller/content/distiller_javascript_utils.h',
-            'dom_distiller/content/distiller_page_web_contents.cc',
-            'dom_distiller/content/distiller_page_web_contents.h',
-            'dom_distiller/content/dom_distiller_viewer_source.cc',
-            'dom_distiller/content/dom_distiller_viewer_source.h',
-            'dom_distiller/content/web_contents_main_frame_observer.cc',
-            'dom_distiller/content/web_contents_main_frame_observer.h',
+            'dom_distiller/content/browser/distillable_page_utils.cc',
+            'dom_distiller/content/browser/distillable_page_utils.h',
+            'dom_distiller/content/browser/distillable_page_utils_android.cc',
+            'dom_distiller/content/browser/distillable_page_utils_android.h',
+            'dom_distiller/content/browser/distiller_javascript_utils.cc',
+            'dom_distiller/content/browser/distiller_javascript_utils.h',
+            'dom_distiller/content/browser/distiller_page_web_contents.cc',
+            'dom_distiller/content/browser/distiller_page_web_contents.h',
+            'dom_distiller/content/browser/dom_distiller_viewer_source.cc',
+            'dom_distiller/content/browser/dom_distiller_viewer_source.h',
+            'dom_distiller/content/browser/web_contents_main_frame_observer.cc',
+            'dom_distiller/content/browser/web_contents_main_frame_observer.h',
           ],
           'conditions': [
             ['OS == "android"', {
diff --git a/components/dom_distiller/android/component_jni_registrar.cc b/components/dom_distiller/android/component_jni_registrar.cc
index 2ea4b57..56ba109 100644
--- a/components/dom_distiller/android/component_jni_registrar.cc
+++ b/components/dom_distiller/android/component_jni_registrar.cc
@@ -7,7 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
 #include "base/basictypes.h"
-#include "components/dom_distiller/content/distillable_page_utils_android.h"
+#include "components/dom_distiller/content/browser/distillable_page_utils_android.h"
 #include "components/dom_distiller/core/distilled_page_prefs_android.h"
 #include "components/dom_distiller/core/dom_distiller_service_android.h"
 #include "components/dom_distiller/core/url_utils_android.h"
diff --git a/components/dom_distiller/content/BUILD.gn b/components/dom_distiller/content/BUILD.gn
index 4db3257..cfc173e 100644
--- a/components/dom_distiller/content/BUILD.gn
+++ b/components/dom_distiller/content/BUILD.gn
@@ -4,18 +4,18 @@
 
 if (!is_ios) {
   # GYP version: components/dom_distiller.gypi:dom_distiller_content
-  static_library("content") {
+  static_library("content_browser") {
     sources = [
-      "distillable_page_utils.cc",
-      "distillable_page_utils.h",
-      "distiller_javascript_utils.cc",
-      "distiller_javascript_utils.h",
-      "distiller_page_web_contents.cc",
-      "distiller_page_web_contents.h",
-      "dom_distiller_viewer_source.cc",
-      "dom_distiller_viewer_source.h",
-      "web_contents_main_frame_observer.cc",
-      "web_contents_main_frame_observer.h",
+      "browser/distillable_page_utils.cc",
+      "browser/distillable_page_utils.h",
+      "browser/distiller_javascript_utils.cc",
+      "browser/distiller_javascript_utils.h",
+      "browser/distiller_page_web_contents.cc",
+      "browser/distiller_page_web_contents.h",
+      "browser/dom_distiller_viewer_source.cc",
+      "browser/dom_distiller_viewer_source.h",
+      "browser/web_contents_main_frame_observer.cc",
+      "browser/web_contents_main_frame_observer.h",
     ]
 
     public_deps = [
@@ -35,8 +35,8 @@ if (!is_ios) {
 
     if (is_android) {
       sources += [
-        "distillable_page_utils_android.cc",
-        "distillable_page_utils_android.h",
+        "browser/distillable_page_utils_android.cc",
+        "browser/distillable_page_utils_android.h",
       ]
       deps += [ ":jni_headers" ]
     }
diff --git a/components/dom_distiller/content/distillable_page_utils.cc b/components/dom_distiller/content/browser/distillable_page_utils.cc
index eb500fa..5487c62 100644
--- a/components/dom_distiller/content/distillable_page_utils.cc
+++ b/components/dom_distiller/content/browser/distillable_page_utils.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/dom_distiller/content/distillable_page_utils.h"
+#include "components/dom_distiller/content/browser/distillable_page_utils.h"
 
 #include "base/bind.h"
 #include "base/location.h"
@@ -10,7 +10,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/core/distillable_page_detector.h"
 #include "components/dom_distiller/core/experiments.h"
 #include "components/dom_distiller/core/page_features.h"
diff --git a/components/dom_distiller/content/distillable_page_utils.h b/components/dom_distiller/content/browser/distillable_page_utils.h
index a7f8c06..bcc6d40 100644
--- a/components/dom_distiller/content/distillable_page_utils.h
+++ b/components/dom_distiller/content/browser/distillable_page_utils.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_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_H_
 
 #include "base/callback.h"
 #include "content/public/browser/web_contents.h"
@@ -30,4 +30,4 @@ void IsDistillablePageForDetector(content::WebContents* web_contents,
                                   base::Callback<void(bool)> callback);
 }
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_H_
diff --git a/components/dom_distiller/content/distillable_page_utils_android.cc b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
index eac1f24..bf1f80d 100644
--- a/components/dom_distiller/content/distillable_page_utils_android.cc
+++ b/components/dom_distiller/content/browser/distillable_page_utils_android.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/dom_distiller/content/distillable_page_utils_android.h"
+#include "components/dom_distiller/content/browser/distillable_page_utils_android.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
-#include "components/dom_distiller/content/distillable_page_utils.h"
+#include "components/dom_distiller/content/browser/distillable_page_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/DistillablePageUtils_jni.h"
 
diff --git a/components/dom_distiller/content/distillable_page_utils_android.h b/components/dom_distiller/content/browser/distillable_page_utils_android.h
index ea75799..ba8bb75 100644
--- a/components/dom_distiller/content/distillable_page_utils_android.h
+++ b/components/dom_distiller/content/browser/distillable_page_utils_android.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_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_ANDROID_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_ANDROID_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_ANDROID_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_ANDROID_H_
 
 #include <jni.h>
 
@@ -13,4 +13,4 @@ bool RegisterDistillablePageUtils(JNIEnv* env);
 }
 }
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLABLE_PAGE_UTILS_ANDROID_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLABLE_PAGE_UTILS_ANDROID_H_
diff --git a/components/dom_distiller/content/distillable_page_utils_browsertest.cc b/components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc
index 793e24b..7723e67 100644
--- a/components/dom_distiller/content/distillable_page_utils_browsertest.cc
+++ b/components/dom_distiller/content/browser/distillable_page_utils_browsertest.cc
@@ -5,8 +5,8 @@
 #include "base/bind.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
-#include "components/dom_distiller/content/distillable_page_utils.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/distillable_page_utils.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 #include "components/dom_distiller/core/distillable_page_detector.h"
 #include "components/dom_distiller/core/page_features.h"
 #include "content/public/browser/browser_context.h"
diff --git a/components/dom_distiller/content/distiller_javascript_utils.cc b/components/dom_distiller/content/browser/distiller_javascript_utils.cc
index 28a55dc..f567413 100644
--- a/components/dom_distiller/content/distiller_javascript_utils.cc
+++ b/components/dom_distiller/content/browser/distiller_javascript_utils.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/dom_distiller/content/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
 
 #include <string>
 
diff --git a/components/dom_distiller/content/distiller_javascript_utils.h b/components/dom_distiller/content/browser/distiller_javascript_utils.h
index b80a6ce..bcb5297a 100644
--- a/components/dom_distiller/content/distiller_javascript_utils.h
+++ b/components/dom_distiller/content/browser/distiller_javascript_utils.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_DOM_DISTILLER_CONTENT_DISTILLER_JAVASCRIPT_UTILS_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_JAVASCRIPT_UTILS_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_JAVASCRIPT_UTILS_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_JAVASCRIPT_UTILS_H_
 
 #include <string>
 
@@ -28,4 +28,4 @@ void RunIsolatedJavaScript(content::RenderFrameHost* render_frame_host,
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_JAVASCRIPT_UTILS_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_JAVASCRIPT_UTILS_H_
diff --git a/components/dom_distiller/content/distiller_page_web_contents.cc b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
index 2c7493f..0173212 100644
--- a/components/dom_distiller/content/distiller_page_web_contents.cc
+++ b/components/dom_distiller/content/browser/distiller_page_web_contents.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "components/dom_distiller/content/distiller_page_web_contents.h"
+#include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/dom_distiller_constants.h"
 #include "components/dom_distiller/core/dom_distiller_service.h"
diff --git a/components/dom_distiller/content/distiller_page_web_contents.h b/components/dom_distiller/content/browser/distiller_page_web_contents.h
index fcf368f..4b28fc8 100644
--- a/components/dom_distiller/content/distiller_page_web_contents.h
+++ b/components/dom_distiller/content/browser/distiller_page_web_contents.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_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_PAGE_WEB_CONTENTS_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_PAGE_WEB_CONTENTS_H_
 
 #include <string>
 
@@ -120,4 +120,4 @@ class DistillerPageWebContents : public DistillerPage,
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DISTILLER_PAGE_WEB_CONTENTS_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DISTILLER_PAGE_WEB_CONTENTS_H_
diff --git a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
index a743a3c..99f40f0 100644
--- a/components/dom_distiller/content/distiller_page_web_contents_browsertest.cc
+++ b/components/dom_distiller/content/browser/distiller_page_web_contents_browsertest.cc
@@ -7,9 +7,9 @@
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/distiller_page_web_contents.h"
-#include "components/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "components/dom_distiller/core/distiller_page.h"
 #include "components/dom_distiller/core/proto/distilled_article.pb.h"
 #include "components/dom_distiller/core/proto/distilled_page.pb.h"
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
index b6b611c..97fb245 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.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/dom_distiller/content/dom_distiller_viewer_source.h"
+#include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 
 #include <sstream>
 #include <string>
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source.h b/components/dom_distiller/content/browser/dom_distiller_viewer_source.h
index 4920252..b194098 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source.h
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.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_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DOM_DISTILLER_VIEWER_SOURCE_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DOM_DISTILLER_VIEWER_SOURCE_H_
 
 #include <string>
 
@@ -63,4 +63,4 @@ class DomDistillerViewerSource : public content::URLDataSource {
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_DOM_DISTILLER_VIEWER_SOURCE_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_DOM_DISTILLER_VIEWER_SOURCE_H_
diff --git a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source_unittest.cc
index 81d459e..4ce4ba3 100644
--- a/components/dom_distiller/content/dom_distiller_viewer_source_unittest.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source_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/dom_distiller/content/dom_distiller_viewer_source.h"
+#include "components/dom_distiller/content/browser/dom_distiller_viewer_source.h"
 
 #include "components/dom_distiller/core/url_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc b/components/dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc
index 2bfb501..97c48d6 100644
--- a/components/dom_distiller/content/test/dom_distiller_js_browsertest.cc
+++ b/components/dom_distiller/content/browser/test/dom_distiller_js_browsertest.cc
@@ -12,7 +12,7 @@
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "base/values.h"
-#include "components/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/web_contents_observer.h"
diff --git a/components/dom_distiller/content/web_contents_main_frame_observer.cc b/components/dom_distiller/content/browser/web_contents_main_frame_observer.cc
index c16a025..51fd690 100644
--- a/components/dom_distiller/content/web_contents_main_frame_observer.cc
+++ b/components/dom_distiller/content/browser/web_contents_main_frame_observer.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/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
diff --git a/components/dom_distiller/content/web_contents_main_frame_observer.h b/components/dom_distiller/content/browser/web_contents_main_frame_observer.h
index e1a6299..ac1e8e6 100644
--- a/components/dom_distiller/content/web_contents_main_frame_observer.h
+++ b/components/dom_distiller/content/browser/web_contents_main_frame_observer.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_DOM_DISTILLER_CONTENT_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
-#define COMPONENTS_DOM_DISTILLER_CONTENT_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
+#ifndef COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
+#define COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
 
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
@@ -55,4 +55,4 @@ class WebContentsMainFrameObserver
 
 }  // namespace dom_distiller
 
-#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
+#endif  // COMPONENTS_DOM_DISTILLER_CONTENT_BROWSER_WEB_CONTENTS_MAIN_FRAME_OBSERVER_H_
diff --git a/components/dom_distiller/content/web_contents_main_frame_observer_unittest.cc b/components/dom_distiller/content/browser/web_contents_main_frame_observer_unittest.cc
index eeed653..3c118da 100644
--- a/components/dom_distiller/content/web_contents_main_frame_observer_unittest.cc
+++ b/components/dom_distiller/content/browser/web_contents_main_frame_observer_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/dom_distiller/content/web_contents_main_frame_observer.h"
+#include "components/dom_distiller/content/browser/web_contents_main_frame_observer.h"
 
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_frame_host.h"
diff --git a/components/dom_distiller/standalone/content_extractor_browsertest.cc b/components/dom_distiller/standalone/content_extractor_browsertest.cc
index be5c0bc..963d181 100644
--- a/components/dom_distiller/standalone/content_extractor_browsertest.cc
+++ b/components/dom_distiller/standalone/content_extractor_browsertest.cc
@@ -14,8 +14,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/thread_task_runner_handle.h"
-#include "components/dom_distiller/content/distiller_javascript_utils.h"
-#include "components/dom_distiller/content/distiller_page_web_contents.h"
+#include "components/dom_distiller/content/browser/distiller_javascript_utils.h"
+#include "components/dom_distiller/content/browser/distiller_page_web_contents.h"
 #include "components/dom_distiller/core/article_entry.h"
 #include "components/dom_distiller/core/distilled_page_prefs.h"
 #include "components/dom_distiller/core/distiller.h"
diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index 949fbe1..d64840d 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -257,7 +257,7 @@ source_set("chrome_extensions_browsertests") {
     "//components/autofill/content/browser/wallet:test_support",
     "//components/autofill/content/renderer:test_support",
     "//components/captive_portal:test_support",
-    "//components/dom_distiller/content",
+    "//components/dom_distiller/content:content_browser",
     "//components/dom_distiller/core:test_support",
     "//components/guest_view/browser:test_support",
     "//components/resources",