Simplify the default browser infobar.

chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc

 // Copyright (c) 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.
 
 #include <string>
 
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/sync/test/integration/preferences_helper.h"
@@ skipping 57 matching lines @@
 
   ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1");
   ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
   EXPECT_EQ("http://www.google.com/1", GetPrefs(0)->GetString(prefs::kHomePage));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, UnsyncableBooleanPref) {
   ASSERT_TRUE(SetupSync());
   DisableVerifier();
   ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
-  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kCheckDefaultBrowser));
+  ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kDisableScreenshots));
 
   // This pref is not syncable.
-  ChangeBooleanPref(0, prefs::kCheckDefaultBrowser);
+  ChangeBooleanPref(0, prefs::kDisableScreenshots);
 
   // This pref is syncable.
   ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
 
   // Wait until the syncable pref is synced, then expect that the non-syncable
   // one is still out of sync.
   ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
-  ASSERT_FALSE(BooleanPrefMatches(prefs::kCheckDefaultBrowser));
+  ASSERT_FALSE(BooleanPrefMatches(prefs::kDisableScreenshots));
 }
 
 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, StringPref) {
   ASSERT_TRUE(SetupSync());
   ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 
   ChangeStringPref(0, prefs::kHomePage, "http://news.google.com");
   ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage));
 }
 
@@ skipping 36 matching lines @@
 
   ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage);
   ASSERT_TRUE(EnableEncryption(0));
   ASSERT_TRUE(EnableEncryption(1));
   ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage));
 
   ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
   ChangeBooleanPref(0, prefs::kShowHomeButton);
   ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton));
 }