[Offline Pages] Move files without dependency on Android to os-independent folder.

This is ongoing refactoring of offline pages, in order to remove/isolate
Android-specific dependdencies. In this case, it's just a result
of:
tools/git/move_source_file.py chrome/browser/android/offline_pages/offline_page_bookmark_observer.* chrome/browser/offline_pages/

Bug: 722467
Change-Id: I35ecde79bee6b6fba7d7c27d75c5fb7be1799c00
Reviewed-on: https://chromium-review.googlesource.com/568565Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Yafei Duan <romax@chromium.org>
Commit-Queue: Dmitry Titov <dimich@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486202}

chrome/browser/BUILD.gn

@@ -2152,8 +2152,6 @@ split_static_library("browser") {
       "android/offline_pages/downloads/offline_page_notification_bridge.h",
       "android/offline_pages/downloads/resource_throttle.cc",
       "android/offline_pages/downloads/resource_throttle.h",
-      "android/offline_pages/offline_page_bookmark_observer.cc",
-      "android/offline_pages/offline_page_bookmark_observer.h",
       "android/offline_pages/offline_page_bridge.cc",
       "android/offline_pages/offline_page_bridge.h",
       "android/offline_pages/offline_page_info_handler.cc",
@@ -2184,6 +2182,8 @@ split_static_library("browser") {
       "android/offline_pages/request_coordinator_factory.h",
       "offline_pages/background_loader_offliner.cc",
       "offline_pages/background_loader_offliner.h",
+      "offline_pages/offline_page_bookmark_observer.cc",
+      "offline_pages/offline_page_bookmark_observer.h",
       "offline_pages/offline_page_model_factory.cc",
       "offline_pages/offline_page_model_factory.h",
       "offline_pages/offliner_user_data.cc",

chrome/browser/bookmarks/chrome_bookmark_client.cc

@@ -18,9 +18,10 @@
 #include "components/favicon/core/favicon_util.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/url_database.h"
+#include "components/offline_pages/features/features.h"
 
-#if defined(OS_ANDROID)
-#include "chrome/browser/android/offline_pages/offline_page_bookmark_observer.h"
+#if BUILDFLAG(ENABLE_OFFLINE_PAGES)
+#include "chrome/browser/offline_pages/offline_page_bookmark_observer.h"
 #endif
 
 ChromeBookmarkClient::ChromeBookmarkClient(
@@ -35,7 +36,7 @@ void ChromeBookmarkClient::Init(bookmarks::BookmarkModel* model) {
   if (managed_bookmark_service_)
     managed_bookmark_service_->BookmarkModelCreated(model);
 
-#if defined(OS_ANDROID)
+#if BUILDFLAG(ENABLE_OFFLINE_PAGES)
   offline_page_observer_ =
       base::MakeUnique<offline_pages::OfflinePageBookmarkObserver>(profile_);
   model->AddObserver(offline_page_observer_.get());

chrome/browser/android/offline_pages/offline_page_bookmark_observer.cc → chrome/browser/offline_pages/offline_page_bookmark_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 "chrome/browser/android/offline_pages/offline_page_bookmark_observer.h"
+#include "chrome/browser/offline_pages/offline_page_bookmark_observer.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "components/bookmarks/browser/bookmark_node.h"

chrome/browser/android/offline_pages/offline_page_bookmark_observer.h → chrome/browser/offline_pages/offline_page_bookmark_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 CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_
-#define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_
+#ifndef CHROME_BROWSER_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_
+#define CHROME_BROWSER_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_
 
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/offline_pages/offline_page_model_factory.h"
@@ -52,4 +52,4 @@ class OfflinePageBookmarkObserver
 };
 }  // namespace offline_pages
 
-#endif  // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_
+#endif  // CHROME_BROWSER_OFFLINE_PAGES_OFFLINE_PAGE_BOOKMARK_OBSERVER_H_