[ios] Refactor SessionServiceIOS to remove dependency on BrowserState.

ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm

Index: ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm
diff --git a/ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm b/ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm
index 4eaf66f2b8a1be269beb7ac3e82d7fa23c9000de..2fc56eb521bea53e331c5c95ae98bf2eb9f65909 100644
--- a/ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm
+++ b/ios/chrome/browser/crash_report/crash_restore_helper_unittest.mm
@@ -8,6 +8,7 @@
 
 #include "base/logging.h"
 #include "base/strings/sys_string_conversions.h"
+#include "base/threading/thread_task_runner_handle.h"
 #include "ios/chrome/browser/browser_state/chrome_browser_state.h"
 #include "ios/chrome/browser/browser_state/test_chrome_browser_state.h"
 #include "ios/chrome/browser/crash_report/crash_restore_helper.h"
@@ -33,10 +34,10 @@ namespace {
 
 class CrashRestoreHelperTest : public PlatformTest {
  public:
-  void SetUp() override {
+  CrashRestoreHelperTest() {
     TestChromeBrowserState::Builder test_cbs_builder;
     chrome_browser_state_ = test_cbs_builder.Build();
-    otr_chrome_browser_state_ =
+    off_the_record_chrome_browser_state_ =
         chrome_browser_state_->GetOffTheRecordChromeBrowserState();
     helper_ = [[CrashRestoreHelper alloc]
         initWithBrowserState:chrome_browser_state_.get()];
@@ -45,34 +46,41 @@ class CrashRestoreHelperTest : public PlatformTest {
  protected:
   web::TestWebThreadBundle thread_bundle_;
   std::unique_ptr<TestChromeBrowserState> chrome_browser_state_;
-  ios::ChromeBrowserState* otr_chrome_browser_state_;
+  ios::ChromeBrowserState* off_the_record_chrome_browser_state_;
   CrashRestoreHelper* helper_;
 };
 
 TEST_F(CrashRestoreHelperTest, MoveAsideTest) {
-  NSString* backupPath = [helper_ sessionBackupPath];
-  NSFileManager* fileManager = [NSFileManager defaultManager];
-  [fileManager removeItemAtPath:backupPath error:NULL];
+  NSString* backup_path = [helper_ sessionBackupPath];
+  NSFileManager* file_manager = [NSFileManager defaultManager];
+  [file_manager removeItemAtPath:backup_path error:NULL];
 
   NSData* data = [NSData dataWithBytes:"hello" length:5];
-  SessionServiceIOS* sessionService = [SessionServiceIOS sharedService];
-  NSString* profileStashPath =
-      base::SysUTF8ToNSString(chrome_browser_state_->GetStatePath().value());
-  NSString* sessionPath =
-      [sessionService sessionFilePathForDirectory:profileStashPath];
-  [fileManager createFileAtPath:sessionPath contents:data attributes:nil];
-  NSString* otrProfileStashPath = base::SysUTF8ToNSString(
-      otr_chrome_browser_state_->GetStatePath().value());
-  NSString* otrSessionPath =
-      [sessionService sessionFilePathForDirectory:otrProfileStashPath];
-  [fileManager createFileAtPath:otrSessionPath contents:data attributes:nil];
+  ios::ChromeBrowserState* browser_states[] = {
+      chrome_browser_state_.get(), off_the_record_chrome_browser_state_,
+  };
+
+  for (size_t index = 0; index < arraysize(browser_states); ++index) {
+    NSString* state_path =
+        base::SysUTF8ToNSString(browser_states[index]->GetStatePath().value());
+    NSString* session_path =
+        [SessionServiceIOS sessionPathForDirectory:state_path];
+    [file_manager createFileAtPath:session_path contents:data attributes:nil];
+    ASSERT_EQ(YES, [file_manager fileExistsAtPath:session_path]);
+  }
 
   [helper_ moveAsideSessionInformation];
 
-  EXPECT_EQ(NO, [fileManager fileExistsAtPath:sessionPath]);
-  EXPECT_EQ(NO, [fileManager fileExistsAtPath:otrSessionPath]);
-  EXPECT_EQ(YES, [fileManager fileExistsAtPath:backupPath]);
-  [fileManager removeItemAtPath:backupPath error:NULL];
+  for (size_t index = 0; index < arraysize(browser_states); ++index) {
+    NSString* state_path =
+        base::SysUTF8ToNSString(browser_states[index]->GetStatePath().value());
+    NSString* session_path =
+        [SessionServiceIOS sessionPathForDirectory:state_path];
+    EXPECT_EQ(NO, [file_manager fileExistsAtPath:session_path]);
+  }
+
+  EXPECT_EQ(YES, [file_manager fileExistsAtPath:backup_path]);
+  [file_manager removeItemAtPath:backup_path error:NULL];
 }
 
 }  // namespace