Remove obsoleted function and add test

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"
@@ skipping 37 matching lines @@
  public:
   OfflinePageUtilsTest();
   ~OfflinePageUtilsTest() override;
 
   void SetUp() override;
   void RunUntilIdle();
 
   // Necessary callbacks for the offline page model.
   void OnSavePageDone(SavePageResult result, int64_t offlineId);
   void OnClearAllDone();
+  void OnGetURLDone(const GURL& url);
 
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
 
   // Offline page URL for the first page.
   const GURL& offline_url_page_1() const { return offline_url_page_1_; }
   // Offline page URL for the second page.
   const GURL& offline_url_page_2() const { return offline_url_page_2_; }
   // Offline page URL not related to any page.
   const GURL& offline_url_missing() const { return offline_url_missing_; }
 
   TestingProfile* profile() { return &profile_; }
 
   int64_t offline_id() const { return offline_id_; }
 
+  GURL url() const { return url_; }

[dewittj, 2016/06/09 22:13:58]

nit: const GURL&

[Vivian, 2016/06/10 17:38:14]

Done.

+
  private:
   void CreateOfflinePages();
   std::unique_ptr<OfflinePageTestArchiver> BuildArchiver(
       const GURL& url,
       const base::FilePath& file_name);
 
   GURL offline_url_page_1_;
   GURL offline_url_page_2_;
   GURL offline_url_missing_;
 
   int64_t offline_id_;
+  GURL url_;
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
   TestingProfile profile_;
 };
 
 OfflinePageUtilsTest::OfflinePageUtilsTest()
     : task_runner_(new base::TestSimpleTaskRunner),
       task_runner_handle_(task_runner_) {}
 
@@ skipping 24 matching lines @@
 
 void OfflinePageUtilsTest::OnSavePageDone(SavePageResult result,
                                           int64_t offline_id) {
   offline_id_ = offline_id;
 }
 
 void OfflinePageUtilsTest::OnClearAllDone() {
   // Result ignored here.
 }
 
+void OfflinePageUtilsTest::OnGetURLDone(const GURL& url) {
+  // Save url here to verify
+  url_ = url;
+}
+
 void OfflinePageUtilsTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {}
 
 void OfflinePageUtilsTest::CreateOfflinePages() {
   OfflinePageModel* model =
       OfflinePageModelFactory::GetForBrowserContext(profile());
 
   // Create page 1.
   std::unique_ptr<OfflinePageTestArchiver> archiver(BuildArchiver(
       kTestPage1Url, base::FilePath(FILE_PATH_LITERAL("page1.mhtml"))));
@@ skipping 43 matching lines @@
   // URL is invalid.
   EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("/test.mhtml")));
   // Scheme is not file.
   EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("http://test.com/")));
   // Does not end with .mhtml.
   EXPECT_FALSE(OfflinePageUtils::MightBeOfflineURL(GURL("file:///test.txt")));
   // Might still be an offline page.
   EXPECT_TRUE(OfflinePageUtils::MightBeOfflineURL(GURL("file:///test.mhtml")));
 }
 
-TEST_F(OfflinePageUtilsTest, MaybeGetOfflineURLForOnlineURL) {
-  EXPECT_EQ(offline_url_page_1(),
-            OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(profile(),
-                                                             kTestPage1Url));
-  EXPECT_EQ(offline_url_page_2(),
-            OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(profile(),
-                                                             kTestPage2Url));
-  EXPECT_EQ(GURL(), OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(
-                        profile(), GURL(kTestPage3Url)));
+
+TEST_F(OfflinePageUtilsTest, GetOfflineURLForOnlineURL) {
+  OfflinePageUtils::GetOfflineURLForOnlineURL(profile(), kTestPage1Url, base::Bind(&OfflinePageUtilsTest::OnGetURLDone, AsWeakPtr()));

[dewittj, 2016/06/09 22:13:58]

It doesn't look like this is waiting for the call to complete so url() will
never be set by the time you call it.

Looks like you need a RunUntilIdle(); here, but I'd recommend making a helper
function :

GURL OfflinePageUtilsTest::GetOfflineURLForOnlineURL(GURL online_url,
base::Callback<void(const GURL&)> callback)

that does the actual OfflinePageUtils call, runs until idle, and then returns
url().  That'd make the actual test code more straightforward.

[Vivian, 2016/06/10 17:38:14]

Done.

+  GURL url_1 = url();
+  EXPECT_EQ(offline_url_page_1(), url_1);
+
+  OfflinePageUtils::GetOfflineURLForOnlineURL(profile(), kTestPage2Url, base::Bind(&OfflinePageUtilsTest::OnGetURLDone, AsWeakPtr()));
+  GURL url_2 = url();
+  EXPECT_EQ(offline_url_page_2(), url_2);
+
+  OfflinePageUtils::GetOfflineURLForOnlineURL(profile(), GURL(kTestPage3Url), base::Bind(&OfflinePageUtilsTest::OnGetURLDone, AsWeakPtr()));
+  GURL url_3 = url();
+  EXPECT_EQ(GURL(), url_3);
 }
 
+
 TEST_F(OfflinePageUtilsTest, MaybeGetOnlineURLForOfflineURL) {
   EXPECT_EQ(kTestPage1Url, OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
                                profile(), offline_url_page_1()));
   EXPECT_EQ(kTestPage2Url, OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
                                profile(), offline_url_page_2()));
   EXPECT_EQ(GURL::EmptyGURL(), OfflinePageUtils::MaybeGetOnlineURLForOfflineURL(
                                    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