Make UpdaterStateTest.Serialize pass on Chrome-branded builds

components/update_client/updater_state_unittest.cc

Index: components/update_client/updater_state_unittest.cc
diff --git a/components/update_client/updater_state_unittest.cc b/components/update_client/updater_state_unittest.cc
index 74828596c8d0b10453c97ec8ce29edc07c97e498..7627b46a22d8ba8ab8cdcbc94e68d0dad9653059 100644
--- a/components/update_client/updater_state_unittest.cc
+++ b/components/update_client/updater_state_unittest.cc
@@ -41,14 +41,14 @@ TEST_F(UpdaterStateTest, Serialize) {
   EXPECT_STREQ("1", attributes.at("autoupdatecheckenabled").c_str());
   EXPECT_STREQ("1", attributes.at("updatepolicy").c_str());
 
-  // Tests some of the remaining values.
-  updater_state = UpdaterState(false);
-
 #if defined(GOOGLE_CHROME_BUILD)
   // The name of the Windows updater for Chrome.
-  EXPECT_STREQ("Omaha", attributes.at("name").c_str());

[hans, 2016/11/16 20:39:06]

We just checked above (line 36) that this returns "the updater", so this test
would always fail.

+  EXPECT_STREQ("Omaha", UpdaterState::GetState(false)->at("name").c_str());
 #endif  // GOOGLE_CHROME_BUILD
 
+  // Tests some of the remaining values.
+  updater_state = UpdaterState(false);
+
   // Don't serialize an invalid version if it could not be read.
   updater_state.updater_version_ = base::Version();
   attributes = updater_state.BuildAttributes();