Switch ChromeTestSuite to the same convention as ContentTestSuite:

chrome/browser/ui/shell_dialogs_unittest.cc

 // Copyright (c) 2011 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/file_path.h"
 #include "base/file_util.h"
 #include "base/string16.h"
 #include "base/values.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/shell_dialogs.h"
-#include "chrome/test/base/testing_browser_process_test.h"
+#include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FileSelectionUser : public SelectFileDialog::Listener {
  public:
   FileSelectionUser()
       : file_selection_initialisation_in_progress(false) {
   }
 
@@ skipping 35 matching lines @@
   virtual void FileSelectionCanceled(void* params) {
     ASSERT_FALSE(file_selection_initialisation_in_progress);
   }
 
  private:
   scoped_refptr<SelectFileDialog> select_file_dialog_;
 
   bool file_selection_initialisation_in_progress;
 };
 
-typedef TestingBrowserProcessTest FileSelectionDialogTest;
+typedef testing::Test FileSelectionDialogTest;
 
 // Tests if SelectFileDialog::SelectFile returns asynchronously with
 // file-selection dialogs disabled by policy.
 TEST_F(FileSelectionDialogTest, ExpectAsynchronousListenerCall) {
   MessageLoopForUI message_loop;
   BrowserThread ui_thread(BrowserThread::UI, &message_loop);
 
-  ScopedTestingLocalState local_state_(testing_browser_process_.get());
+  ScopedTestingLocalState local_state(
+      static_cast<TestingBrowserProcess*>(g_browser_process));
 
   scoped_ptr<FileSelectionUser> file_selection_user(new FileSelectionUser());
 
   // Disallow file-selection dialogs.
-  local_state_.Get()->SetManagedPref(
+  local_state.Get()->SetManagedPref(
       prefs::kAllowFileSelectionDialogs,
       Value::CreateBooleanValue(false));
 
   file_selection_user->StartFileSelection();
 }