Refactor UITestBase/ProxyLauncher.

chrome/browser/dom_ui/new_tab_ui_uitest.cc

 // Copyright (c) 2010 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 "chrome/test/ui/ui_test.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/dom_ui/new_tab_ui.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/sync/signin_manager.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/testing_pref_service.h"
 
 class NewTabUITest : public UITest {
  public:
   NewTabUITest() {
     dom_automation_enabled_ = true;
     // Set home page to the empty string so that we can set the home page using
     // preferences.
-    homepage_ = "";
+    set_homepage("");
 
     // Setup the DEFAULT_THEME profile (has fake history entries).
     set_template_user_data(UITest::ComputeTypicalUserDataSource(
-        UITest::DEFAULT_THEME));
+        ProxyLauncher::DEFAULT_THEME));
   }
 };
 
 TEST_F(NewTabUITest, NTPHasThumbnails) {
   // Switch to the "new tab" tab, which should be any new tab after the
   // first (the first is about:blank).
   scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(window.get());
 
   // Bring up a new tab page.
@@ skipping 104 matching lines @@
   ASSERT_EQ(0, prefs->GetInteger(prefs::kNTPPrefVersion));
 
   bool migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_TRUE(migrated);
   ASSERT_EQ(NewTabUI::current_pref_version(),
             prefs->GetInteger(prefs::kNTPPrefVersion));
 
   migrated = NewTabUI::UpdateUserPrefsVersion(prefs.get());
   ASSERT_FALSE(migrated);
 }