Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/ui/webui/options/chromeos/shared_options_browsertest.cc

 // Copyright 2014 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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
@@ skipping 85 matching lines @@
     CrosSettings* settings = CrosSettings::Get();
 
     // Add the stub settings provider, moving the device settings provider
     // behind it so our stub takes precedence.
     device_settings_provider_ = settings->GetProvider(kDeviceOwner);
     settings->RemoveSettingsProvider(device_settings_provider_);
     settings->AddSettingsProvider(&stub_settings_provider_);
     settings->AddSettingsProvider(device_settings_provider_);
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     CrosSettings* settings = CrosSettings::Get();
     settings->RemoveSettingsProvider(&stub_settings_provider_);
-    LoginManagerTest::CleanUpOnMainThread();
+    LoginManagerTest::TearDownOnMainThread();
   }
 
  protected:
   void CheckOptionsUI(const User* user, bool is_owner, bool is_primary) {
     Browser* browser = CreateBrowserForUser(user);
     content::WebContents* contents =
         browser->tab_strip_model()->GetActiveWebContents();
 
     for (size_t i = 0; i < sizeof(kPrefTests) / sizeof(kPrefTests[0]); i++) {
       CheckPreference(contents,
@@ skipping 300 matching lines @@
   content::WaitForLoadStop(contents);
   {
     SCOPED_TRACE("Screen lock false for both users");
     expected_value = false;
     CheckBooleanPreference(contents, prefs::kEnableAutoScreenLock, disabled,
                            empty_controlled, expected_value);
   }
 }
 
 }  // namespace chromeos