[Offline pages] Removing bookmarks dependency from offline pages component

chrome/browser/android/offline_pages/offline_page_tab_helper_unittest.cc

 // Copyright 2016 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.
 
 #include "chrome/browser/android/offline_pages/offline_page_tab_helper.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_change_notifier.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace offline_pages {
 
 namespace {
 
 const GURL kTestPageUrl("http://test.org/page1");
-const ClientId kTestPageBookmarkId = ClientId(BOOKMARK_NAMESPACE, "1234");
+const ClientId kTestClientId = ClientId(kBookmarkNamespace, "1234");
 const int64_t kTestFileSize = 876543LL;
 
 class TestNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
   TestNetworkChangeNotifier() : online_(true) {}
 
   net::NetworkChangeNotifier::ConnectionType GetCurrentConnectionType()
       const override {
     return online_ ? net::NetworkChangeNotifier::CONNECTION_UNKNOWN
                    : net::NetworkChangeNotifier::CONNECTION_NONE;
@@ skipping 67 matching lines @@
   OfflinePageModelFactory::GetInstance()->SetTestingFactoryAndUse(
       browser_context(), BuildTestOfflinePageModel);
   RunUntilIdle();
 
   // Saves an offline page.
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(browser_context());
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestPageUrl, base::FilePath(FILE_PATH_LITERAL("page1.mhtml"))));
   model->SavePage(
-      kTestPageUrl, kTestPageBookmarkId, std::move(archiver),
+      kTestPageUrl, kTestClientId, std::move(archiver),
       base::Bind(&OfflinePageTabHelperTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
 }
 
 void OfflinePageTabHelperTest::TearDown() {
   content::RenderViewHostTestHarness::TearDown();
 }
 
 void OfflinePageTabHelperTest::RunUntilIdle() {
   base::RunLoop().RunUntilIdle();
@@ skipping 69 matching lines @@
   GURL online_url = page->url;
 
   StartLoad(online_url);
   EXPECT_EQ(online_url, controller().GetPendingEntry()->GetURL());
 
   FailLoad(online_url);
   EXPECT_EQ(offline_url, controller().GetPendingEntry()->GetURL());
 }
 
 }  // namespace offline_pages