Refactor the offline page storage to include client namespace and id.

chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

 // Copyright 2015 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_utils.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "chrome/browser/android/offline_pages/offline_page_model_factory.h"
 #include "chrome/browser/android/offline_pages/test_offline_page_model_builder.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/offline_pages/offline_page_model.h"
 #include "components/offline_pages/offline_page_switches.h"
 #include "components/offline_pages/offline_page_test_archiver.h"
 #include "components/offline_pages/offline_page_test_store.h"
+#include "components/offline_pages/proto/offline_pages.pb.h"
 #include "net/base/filename_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace offline_pages {
 namespace {
 
 const GURL kTestPage1Url("http://test.org/page1");
 const GURL kTestPage2Url("http://test.org/page2");
 const GURL kTestPage3Url("http://test.org/page3");
-const int64_t kTestPage1BookmarkId = 1234;
-const int64_t kTestPage2BookmarkId = 5678;
+const int64_t kTestPage1OfflineId = 1234;
+const int64_t kTestPage2OfflineId = 5678;
 const int64_t kTestFileSize = 876543LL;
+const char* kTestClientNamespace = "test";
+const char* kTestPage1ClientId = "1234";
+const char* kTestPage2ClientId = "5678";
 
 }  // namespace
 
 class OfflinePageUtilsTest
     : public testing::Test,
       public OfflinePageTestArchiver::Observer,
       public base::SupportsWeakPtr<OfflinePageUtilsTest> {
  public:
   OfflinePageUtilsTest();
   ~OfflinePageUtilsTest() override;
@@ skipping 69 matching lines @@
 void OfflinePageUtilsTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {}
 
 void OfflinePageUtilsTest::CreateOfflinePages() {
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(profile());
 
   // Create page 1.
   scoped_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestPage1Url, base::FilePath(FILE_PATH_LITERAL("page1.mhtml"))));
+  offline_pages::ClientId cid;

[Dmitry Titov, 2016/02/25 03:31:52]

client_id would be a bit better 

[bburns, 2016/02/26 00:14:35]

Done.

+  cid.name_space = kTestClientNamespace;
+  cid.id = kTestPage1ClientId;
   model->SavePage(
-      kTestPage1Url, kTestPage1BookmarkId, std::move(archiver),
+      kTestPage1Url, kTestPage1OfflineId, cid, std::move(archiver),
       base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
 
+  cid.id = kTestPage2ClientId;
   // Create page 2.
   archiver = BuildArchiver(kTestPage2Url,
                            base::FilePath(FILE_PATH_LITERAL("page2.mhtml")));
   model->SavePage(
-      kTestPage2Url, kTestPage2BookmarkId, std::move(archiver),
+      kTestPage2Url, kTestPage2OfflineId, cid, std::move(archiver),
       base::Bind(&OfflinePageUtilsTest::OnSavePageDone, AsWeakPtr()));
   RunUntilIdle();
 
   // Make a copy of local paths of the two pages stored in the model.
   offline_url_page_1_ =
-      model->GetPageByBookmarkId(kTestPage1BookmarkId)->GetOfflineURL();
+      model->GetPageByOfflineId(kTestPage1OfflineId)->GetOfflineURL();
   offline_url_page_2_ =
-      model->GetPageByBookmarkId(kTestPage2BookmarkId)->GetOfflineURL();
+      model->GetPageByOfflineId(kTestPage2OfflineId)->GetOfflineURL();
   // Create a file path that is not associated with any offline page.
   offline_url_missing_ = net::FilePathToFileURL(
       profile()
           ->GetPath()
           .Append(chrome::kOfflinePageArchviesDirname)
           .Append(FILE_PATH_LITERAL("missing_file.mhtml")));
 }
 
 scoped_ptr<OfflinePageTestArchiver> OfflinePageUtilsTest::BuildArchiver(
     const GURL& url,
@@ skipping 39 matching lines @@
 TEST_F(OfflinePageUtilsTest, GetOnlineURLForOfflineURL) {
   EXPECT_EQ(kTestPage1Url, OfflinePageUtils::GetOnlineURLForOfflineURL(
                                profile(), offline_url_page_1()));
   EXPECT_EQ(kTestPage2Url, OfflinePageUtils::GetOnlineURLForOfflineURL(
                                profile(), offline_url_page_2()));
   EXPECT_EQ(GURL::EmptyGURL(), OfflinePageUtils::GetOfflineURLForOnlineURL(
                                    profile(), offline_url_missing()));
 }
 
 TEST_F(OfflinePageUtilsTest, GetBookmarkIdForOfflineURL) {
-  EXPECT_EQ(kTestPage1BookmarkId, OfflinePageUtils::GetBookmarkIdForOfflineURL(
-                                      profile(), offline_url_page_1()));
-  EXPECT_EQ(kTestPage2BookmarkId, OfflinePageUtils::GetBookmarkIdForOfflineURL(
-                                      profile(), offline_url_page_2()));
+  EXPECT_EQ(kTestPage1OfflineId, OfflinePageUtils::GetBookmarkIdForOfflineURL(
+                                     profile(), offline_url_page_1()));
+  EXPECT_EQ(kTestPage2OfflineId, OfflinePageUtils::GetBookmarkIdForOfflineURL(
+                                     profile(), offline_url_page_2()));
   EXPECT_EQ(-1, OfflinePageUtils::GetBookmarkIdForOfflineURL(
                     profile(), offline_url_missing()));
 }
 
 TEST_F(OfflinePageUtilsTest, IsOfflinePage) {
   EXPECT_TRUE(OfflinePageUtils::IsOfflinePage(profile(), offline_url_page_1()));
   EXPECT_TRUE(OfflinePageUtils::IsOfflinePage(profile(), offline_url_page_2()));
   EXPECT_FALSE(
       OfflinePageUtils::IsOfflinePage(profile(), offline_url_missing()));
   EXPECT_FALSE(OfflinePageUtils::IsOfflinePage(profile(), kTestPage1Url));
   EXPECT_FALSE(OfflinePageUtils::IsOfflinePage(profile(), kTestPage2Url));
 }
 
 TEST_F(OfflinePageUtilsTest, HasOfflinePageForOnlineURL) {
   EXPECT_TRUE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage1Url));
   EXPECT_TRUE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage2Url));
   EXPECT_FALSE(
       OfflinePageUtils::HasOfflinePageForOnlineURL(profile(), kTestPage3Url));
 }
 
 }  // namespace offline_pages