Merge 258106 "[Hotword] Making enabling/disabling the setting en..."

chrome/browser/extensions/component_loader_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/extensions/component_loader.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "chrome/browser/extensions/test_extension_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/manifest_handlers/background_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace extensions {
 
 namespace {
 
@@ skipping 86 matching lines @@
   TestingPrefServiceSimple local_state_;
   TestingProfile profile_;
   ComponentLoader component_loader_;
 
   // The root directory of the text extension.
   base::FilePath extension_path_;
 
   // The contents of the text extension's manifest file.
   std::string manifest_contents_;
 
+  content::TestBrowserThreadBundle thread_bundle_;
+
   base::FilePath GetBasePath() {
     base::FilePath test_data_dir;
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir);
     return test_data_dir.AppendASCII("extensions");
   }
 };
 
 TEST_F(ComponentLoaderTest, ParseManifest) {
   scoped_ptr<base::DictionaryValue> manifest;
 
@@ skipping 137 matching lines @@
   component_loader_.AddOrReplace(known_extension);
   EXPECT_EQ(default_count + 1, extension_service_.extensions()->size());
   EXPECT_EQ(1u, extension_service_.unloaded_count());
 
   // Add an invalid component extension.
   std::string extension_id = component_loader_.AddOrReplace(invalid_extension);
   EXPECT_TRUE(extension_id.empty());
 }
 
 }  // namespace extensions