Enable sync for the settings from the Extension Settings API.

chrome/browser/extensions/extension_settings_storage_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 "chrome/browser/extensions/extension_settings_storage_unittest.h"
 
 #include "base/json/json_writer.h"
 #include "base/file_util.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_settings.h"
@@ skipping 33 matching lines @@
   return testing::AssertionSuccess();
 }
 
 ExtensionSettingsStorageTest::ExtensionSettingsStorageTest()
     : key1_("foo"),
       key2_("bar"),
       key3_("baz"),
       empty_dict_(new DictionaryValue),
       dict1_(new DictionaryValue),
       dict12_(new DictionaryValue),
-      dict123_(new DictionaryValue) {
+      dict123_(new DictionaryValue),
+      ui_thread_(BrowserThread::UI, MessageLoop::current()),
+      file_thread_(BrowserThread::FILE, MessageLoop::current()) {
   val1_.reset(Value::CreateStringValue(key1_ + "Value"));
   val2_.reset(Value::CreateStringValue(key2_ + "Value"));
   val3_.reset(Value::CreateStringValue(key3_ + "Value"));
 
   list1_.push_back(key1_);
   list2_.push_back(key2_);
   list12_.push_back(key1_);
   list12_.push_back(key2_);
   list13_.push_back(key1_);
   list13_.push_back(key3_);
   list123_.push_back(key1_);
   list123_.push_back(key2_);
   list123_.push_back(key3_);
 
   dict1_->Set(key1_, val1_->DeepCopy());
   dict12_->Set(key1_, val1_->DeepCopy());
   dict12_->Set(key2_, val2_->DeepCopy());
   dict123_->Set(key1_, val1_->DeepCopy());
   dict123_->Set(key2_, val2_->DeepCopy());
   dict123_->Set(key3_, val3_->DeepCopy());
 }
 
 ExtensionSettingsStorageTest::~ExtensionSettingsStorageTest() {}
 
 void ExtensionSettingsStorageTest::SetUp() {
-  ui_message_loop_.reset(new MessageLoopForUI());
-  ui_thread_.reset(
-      new BrowserThread(BrowserThread::UI, MessageLoop::current()));
-  file_thread_.reset(
-      new BrowserThread(BrowserThread::FILE, MessageLoop::current()));
+  ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
+  settings_.reset(new ExtensionSettings(temp_dir_.path()));
+  storage_ = (GetParam())(*settings_, "fakeExtension");
+  ASSERT_TRUE(storage_ != NULL);
+}
 
-  FilePath temp_dir;
-  file_util::CreateNewTempDirectory(FilePath::StringType(), &temp_dir);
-  settings_ = new ExtensionSettings(temp_dir);
-  storage_ = (GetParam())(settings_.get(), "fakeExtension");
-  DCHECK(storage_ != NULL);
+void ExtensionSettingsStorageTest::TearDown() {
+  // Must do this explicitly here so that it's destroyed before the
+  // message loops are.
+  settings_.reset();
 }
 
 TEST_P(ExtensionSettingsStorageTest, GetWhenEmpty) {
   ASSERT_PRED_FORMAT2(SettingsEq, empty_dict_.get(), storage_->Get(key1_));
   ASSERT_PRED_FORMAT2(SettingsEq,
       empty_dict_.get(), storage_->Get(empty_list_));
   ASSERT_PRED_FORMAT2(SettingsEq, empty_dict_.get(), storage_->Get(list123_));
   ASSERT_PRED_FORMAT2(SettingsEq, empty_dict_.get(), storage_->Get());
 }
 
@@ skipping 132 matching lines @@
 TEST_P(ExtensionSettingsStorageTest, DotsInKeyNamesWithDicts) {
   DictionaryValue outer_dict;
   DictionaryValue* inner_dict = new DictionaryValue();
   outer_dict.Set("foo", inner_dict);
   inner_dict->Set("bar", Value::CreateStringValue("baz"));
 
   ASSERT_PRED_FORMAT2(SettingsEq, &outer_dict, storage_->Set(outer_dict));
   ASSERT_PRED_FORMAT2(SettingsEq, &outer_dict, storage_->Get("foo"));
   ASSERT_PRED_FORMAT2(SettingsEq, empty_dict_.get(), storage_->Get("foo.bar"));
 }