Remove obsoleted function and add test

chrome/browser/android/offline_pages/offline_page_utils_unittest.cc

Index: chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
diff --git a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
index 801897962e6fd0693648bf7aa14b875a18332b36..4a49cd013988c345cf02ee4d74dbeef8bc48c143 100644
--- a/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
+++ b/chrome/browser/android/offline_pages/offline_page_utils_unittest.cc
@@ -53,11 +53,13 @@ class OfflinePageUtilsTest
 
   void SetUp() override;
   void RunUntilIdle();
+  GURL GetOfflineURLForOnlineURL(GURL online_url);
 
   // Necessary callbacks for the offline page model.
   void OnSavePageDone(SavePageResult result, int64_t offlineId);
   void OnClearAllDone();
   void OnExpirePageDone(bool success);
+  void OnGetURLDone(const GURL& url);
 
   // OfflinePageTestArchiver::Observer implementation:
   void SetLastPathCreatedByArchiver(const base::FilePath& file_path) override;
@@ -87,6 +89,7 @@ class OfflinePageUtilsTest
   GURL offline_url_expired_;
 
   int64_t offline_id_;
+  GURL url_;
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle task_runner_handle_;
@@ -135,6 +138,18 @@ void OfflinePageUtilsTest::OnClearAllDone() {
   // Result ignored here.
 }
 
+void OfflinePageUtilsTest::OnGetURLDone(const GURL& url) {
+  url_ = url;
+}
+
+GURL OfflinePageUtilsTest::GetOfflineURLForOnlineURL(GURL online_url) {
+  OfflinePageUtils::GetOfflineURLForOnlineURL(
+      profile(), online_url,
+      base::Bind(&OfflinePageUtilsTest::OnGetURLDone, AsWeakPtr()));
+  RunUntilIdle();
+  return url_;
+}
+
 void OfflinePageUtilsTest::SetLastPathCreatedByArchiver(
     const base::FilePath& file_path) {}
 
@@ -211,17 +226,18 @@ TEST_F(OfflinePageUtilsTest, MightBeOfflineURL) {
   EXPECT_TRUE(OfflinePageUtils::MightBeOfflineURL(GURL("file:///test.mhtml")));
 }
 
-TEST_F(OfflinePageUtilsTest, MaybeGetOfflineURLForOnlineURL) {
+TEST_F(OfflinePageUtilsTest, GetOfflineURLForOnlineURL) {
   EXPECT_EQ(offline_url_page_1(),
-            OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(profile(),
-                                                             kTestPage1Url));
+            OfflinePageUtilsTest::GetOfflineURLForOnlineURL(kTestPage1Url));
+

[fgorski, 2016/06/10 18:03:47]

nit: you don't need empty lines. Other tests are written without them.

[Vivian, 2016/06/10 19:47:31]

Done.

   EXPECT_EQ(offline_url_page_2(),
-            OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(profile(),
-                                                             kTestPage2Url));
-  EXPECT_EQ(GURL::EmptyGURL(), OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(
-                                   profile(), kTestPage3Url));
-  EXPECT_EQ(GURL::EmptyGURL(), OfflinePageUtils::MaybeGetOfflineURLForOnlineURL(
-                                   profile(), kTestPage4Url));
+            OfflinePageUtilsTest::GetOfflineURLForOnlineURL(kTestPage2Url));
+
+  EXPECT_EQ(GURL::EmptyGURL(),
+            OfflinePageUtilsTest::GetOfflineURLForOnlineURL(kTestPage3Url));
+
+  EXPECT_EQ(GURL::EmptyGURL(),
+            OfflinePageUtilsTest::GetOfflineURLForOnlineURL(kTestPage4Url));
 }
 
 TEST_F(OfflinePageUtilsTest, MaybeGetOnlineURLForOfflineURL) {