Supervised User whitelists: update to json format v2

chrome/browser/component_updater/supervised_user_whitelist_installer_unittest.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/bind.h"
 #include "base/callback.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/json/json_file_value_serializer.h"
@@ skipping 145 matching lines @@
     installer->Subscribe(base::Bind(&WhitelistLoadObserver::OnWhitelistReady,
                                     weak_ptr_factory_.GetWeakPtr()));
   }
 
   void Wait() { run_loop_.Run(); }
 
   const base::FilePath& whitelist_path() { return whitelist_path_; }
 
  private:
   void OnWhitelistReady(const std::string& crx_id,
+                        const base::string16& title,
                         const base::FilePath& whitelist_path) {
     EXPECT_EQ(base::FilePath::StringType(), whitelist_path_.value());
     whitelist_path_ = whitelist_path;
     run_loop_.Quit();
   }
 
   base::FilePath whitelist_path_;
 
   base::RunLoop run_loop_;
   base::WeakPtrFactory<WhitelistLoadObserver> weak_ptr_factory_;
@@ skipping 25 matching lines @@
 
     ASSERT_TRUE(
         PathService::Get(chrome::DIR_SUPERVISED_USER_INSTALLED_WHITELISTS,
                          &installed_whitelist_directory_));
     std::string crx_id(kCrxId);
     whitelist_path_ =
         installed_whitelist_directory_.AppendASCII(crx_id + ".json");
 
     scoped_ptr<base::DictionaryValue> whitelist_dict(
         new base::DictionaryValue);
-    whitelist_dict->SetString("file", kWhitelistFile);
-    manifest_.Set("whitelist", whitelist_dict.release());
+    whitelist_dict->SetString("sites", kWhitelistFile);
+    manifest_.Set("whitelisted_content", whitelist_dict.release());
     manifest_.SetString("version", kVersion);
 
     scoped_ptr<base::DictionaryValue> crx_dict(new base::DictionaryValue);
     crx_dict->SetString("name", kName);
     scoped_ptr<base::ListValue> clients(new base::ListValue);
     clients->AppendString(kClientId);
     clients->AppendString(kOtherClientId);
     crx_dict->Set("clients", clients.release());
     pref_.Set(kCrxId, crx_dict.release());
   }
@@ skipping 152 matching lines @@
     base::RunLoop run_loop;
     installer_->UnregisterWhitelist(kOtherClientId, kCrxId);
     run_loop.RunUntilIdle();
   }
   EXPECT_FALSE(component_update_service_.registered_component());
   EXPECT_FALSE(base::DirectoryExists(whitelist_directory_));
   EXPECT_FALSE(base::PathExists(whitelist_path_));
 }
 
 }  // namespace component_updater