Replace deprecated base::NonThreadSafe in chrome/browser/profiles.

chrome/browser/history/android/android_history_provider_service_unittest.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 "chrome/browser/history/android/android_history_provider_service.h"
 
 #include <stdint.h>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 49 matching lines @@
     service_.reset(new AndroidHistoryProviderService(testing_profile_));
   }
 
   void TearDown() override {
     testing_profile_->DestroyHistoryService();
     profile_manager_.DeleteTestingProfile(chrome::kInitialProfile);
     testing_profile_ = nullptr;
   }
 
  protected:
+  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   TestingProfileManager profile_manager_;
-  content::TestBrowserThreadBundle test_browser_thread_bundle_;
   std::unique_ptr<AndroidHistoryProviderService> service_;
   base::CancelableTaskTracker cancelable_tracker_;
   TestingProfile* testing_profile_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AndroidHistoryProviderServiceTest);
 };
 
 class CallbackHelper : public base::RefCountedThreadSafe<CallbackHelper> {
  public:
@@ skipping 201 matching lines @@
   service_->DeleteSearchTerms(std::string(),
                               std::vector<base::string16>(),
                               Bind(&CallbackHelper::OnDeleted, callback.get()),
                               &cancelable_tracker_);
   RunMessageLoop(callback.get());
   EXPECT_TRUE(callback->success());
   EXPECT_EQ(1, callback->count());
 }
 
 }  // namespace