diff --git a/http_fetcher_unittest.cc b/http_fetcher_unittest.cc
index f09bf52..9044129 100644
--- a/http_fetcher_unittest.cc
+++ b/http_fetcher_unittest.cc
@@ -199,7 +199,7 @@
     mock_system_state_.set_connection_manager(&mock_connection_manager_);
   }
 
- virtual HttpFetcher* NewLargeFetcher(size_t num_proxies) = 0;
+  virtual HttpFetcher* NewLargeFetcher(size_t num_proxies) = 0;
   HttpFetcher* NewLargeFetcher() {
     return NewLargeFetcher(1);
   }
@@ -272,7 +272,7 @@
     // Speed up test execution.
     ret->set_idle_seconds(1);
     ret->set_retry_seconds(1);
-    ret->SetBuildType(false);
+    mock_system_state_.get_fake_hardware()->SetIsOfficialBuild(false);
     return ret;
   }
 
@@ -323,7 +323,7 @@
     // Speed up test execution.
     ret->set_idle_seconds(1);
     ret->set_retry_seconds(1);
-    ret->SetBuildType(false);
+    mock_system_state_.get_fake_hardware()->SetIsOfficialBuild(false);
     return ret;
   }
 
@@ -1057,7 +1057,8 @@
       }
       LOG(INFO) << "added range: " << tmp_str;
     }
-    multi_fetcher->SetBuildType(false);
+    dynamic_cast<MockSystemState*>(fetcher_in->GetSystemState())
+        ->get_fake_hardware()->SetIsOfficialBuild(false);
     multi_fetcher->set_delegate(&delegate);
 
     StartTransferArgs start_xfer_args = {multi_fetcher, url};
@@ -1244,7 +1245,9 @@
       bool is_official_build = (i == 1);
       LOG(INFO) << "is_update_allowed_over_connection: " << is_allowed;
       LOG(INFO) << "is_official_build: " << is_official_build;
-      fetcher->SetBuildType(is_official_build);
+      // NewLargeFetcher creates the HttpFetcher* with a MockSystemState.
+      dynamic_cast<MockSystemState*>(fetcher->GetSystemState())
+          ->get_fake_hardware()->SetIsOfficialBuild(is_official_build);
       fetcher->set_delegate(&delegate);
 
       StartTransferArgs start_xfer_args =