Simplify registration of a test ChromeBrowserStateManager.

ios/chrome/browser/omaha/omaha_service_unittest.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/browser/omaha/omaha_service.h"
 
 #include <regex.h>
 #include <sys/types.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/metrics/metrics_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/version_info/version_info.h"
 #include "ios/chrome/browser/application_context.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state_manager.h"
 #include "ios/chrome/browser/install_time_util.h"
 #include "ios/chrome/common/channel_info.h"
-#include "ios/chrome/test/testing_application_context.h"
+#include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_state_manager.h"
 #include "ios/public/provider/chrome/browser/chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/omaha/omaha_service_provider.h"
-#include "ios/web/public/test/test_web_thread.h"
+#include "ios/web/public/test/test_web_thread_bundle.h"
+#include "ios/web/public/web_thread.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 namespace {
 
-const char kUserDataDir[] = ".";
+const char kUserDataDir[] = FILE_PATH_LITERAL(".");
 
 }  // namespace
 
 class OmahaServiceTest : public PlatformTest {
  public:
   OmahaServiceTest()
       : need_update_(false),
-        loop_(base::MessageLoop::TYPE_IO),
-        browser_state_manager_(base::FilePath(kUserDataDir)),
-        ui_thread_(web::WebThread::UI, &loop_),
-        io_thread_(web::WebThread::IO, &loop_) {
+        scoped_browser_state_manager_(
+            base::MakeUnique<TestChromeBrowserStateManager>(
+                base::FilePath(kUserDataDir))) {
     GetApplicationContext()->GetLocalState()->SetInt64(
         metrics::prefs::kInstallDate, install_time_util::kUnknownInstallDate);
     OmahaService::ClearPersistentStateForTests();
-    test_application_id_ = ios::GetChromeBrowserProvider()
-                               ->GetOmahaServiceProvider()
-                               ->GetApplicationID();
   }
 
-  ~OmahaServiceTest() override {}
-
   void OnNeedUpdate(const UpgradeRecommendedDetails& details) {
     need_update_ = true;
   }
 
   bool NeedUpdate() {
     DCHECK_CURRENTLY_ON(web::WebThread::UI);
     if (!need_update_) {
       base::RunLoop().RunUntilIdle();
     }
     return need_update_;
   }
 
   void CleanService(OmahaService* service,
                     const std::string& last_sent_version) {
     service->ClearInstallRetryRequestId();
     service->number_of_tries_ = 0;
     if (last_sent_version.length() == 0)
       service->last_sent_version_ = base::Version("0.0.0.0");
     else
       service->last_sent_version_ = base::Version(last_sent_version);
     service->current_ping_time_ = base::Time();
     service->last_sent_time_ = base::Time();
     service->locale_lang_ = std::string();
   }
 
- protected:
-  std::string test_application_id_;
-  bool need_update_;
-  base::MessageLoop loop_;
-  TestChromeBrowserStateManager browser_state_manager_;
+  std::string test_application_id() const {
+    return ios::GetChromeBrowserProvider()
+        ->GetOmahaServiceProvider()
+        ->GetApplicationID();
+  }
 
  private:
-  web::TestWebThread ui_thread_;
-  web::TestWebThread io_thread_;
+  bool need_update_;
+  IOSChromeScopedTestingChromeBrowserStateManager scoped_browser_state_manager_;
+  web::TestWebThreadBundle thread_bundle_;

[sdefresne, 2017/01/10 14:27:25]

Using web::TestWebThreadBundle is better than using web::TestWebThread.

+
+  DISALLOW_COPY_AND_ASSIGN(OmahaServiceTest);
 };
 
 TEST_F(OmahaServiceTest, PingMessageTest) {
   const char* expectedResult =
       "<request protocol=\"3.0\" version=\"iOS-1.0.0.0\" ismachine=\"1\" "
       "requestid=\"requestId\" sessionid=\"sessionId\""
       " hardware_class=\"[^\"]*\">"
       "<os platform=\"ios\" version=\"[0-9][0-9]*\\(\\.[0-9][0-9]*\\)*\""
       " arch=\"[^\"]*\"/>"
       "<app version=\"[^\"]*\" nextversion=\"\" lang=\"[^\"]*\""
@@ skipping 107 matching lines @@
 
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"56754\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<updatecheck status=\"noupdate\"/><ping status=\"ok\"/>"
       "</app></response>";
   fetcher->SetResponseString(response);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   EXPECT_EQ(0, service.number_of_tries_);
   EXPECT_FALSE(service.current_ping_time_.is_null());
   EXPECT_EQ(service.current_ping_time_, service.next_tries_time_);
   EXPECT_GT(service.last_sent_time_, now);
@@ skipping 16 matching lines @@
 
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"56754\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<event status=\"ok\"/>"
       "</app></response>";
   fetcher->SetResponseString(response);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   EXPECT_FALSE(service.current_ping_time_.is_null());
   EXPECT_GT(service.last_sent_time_, now);
   EXPECT_FALSE(NeedUpdate());
 }
@@ skipping 14 matching lines @@
 
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"56754\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<updatecheck status=\"ok\"><urls>"
       "<url codebase=\"http://www.goo.fr/foo/\"/></urls>"
       "<manifest version=\"0.0.1075.1441\">"
       "<packages>"
       "<package hash=\"0\" name=\"Chrome\" required=\"true\" size=\"0\"/>"
       "</packages>"
       "<actions>"
       "<action event=\"update\" run=\"Chrome\"/>"
       "<action event=\"postinstall\" osminversion=\"6.0\"/>"
@@ skipping 114 matching lines @@
 
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"0\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<event status=\"ok\"/>"
       "</app></response>";
   fetcher->SetResponseString(response);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   EXPECT_EQ(1, service.number_of_tries_);
   EXPECT_LT(service.current_ping_time_ - now, base::TimeDelta::FromMinutes(1));
   EXPECT_GT(service.next_tries_time_, service.current_ping_time_);
   EXPECT_FALSE(NeedUpdate());
@@ skipping 16 matching lines @@
 
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"0\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<updatecheck status=\"noupdate\"/><ping status=\"ok\"/>"
       "</app></response>";
   fetcher->SetResponseString(response);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   EXPECT_EQ(0, service.number_of_tries_);
   EXPECT_FALSE(service.current_ping_time_.is_null());
   EXPECT_GE(service.next_tries_time_ - now, base::TimeDelta::FromHours(2));
   EXPECT_GT(service.last_sent_time_, now);
@@ skipping 15 matching lines @@
   service.SendPing();
   net::TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   DCHECK(fetcher);
   DCHECK(fetcher->delegate());
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(200);
   std::string response =
       std::string(
           "<?xml version=\"1.0\"?><response protocol=\"3.0\" server=\"prod\">"
           "<daystart elapsed_seconds=\"56754\"/><app appid=\"") +
-      test_application_id_ +
+      test_application_id() +
       "\" status=\"ok\">"
       "<updatecheck status=\"noupdate\"/><ping status=\"ok\"/>"
       "</app></response>";
   fetcher->SetResponseString(response);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 
   EXPECT_FALSE(service.IsNextPingInstallRetry());
   id1 = service.GetNextPingRequestId(OmahaService::USAGE_PING);
   ASSERT_NE(id1, service.GetNextPingRequestId(OmahaService::USAGE_PING));
 }