Fix dangerous pointer use in UserScriptMaster

chrome/browser/extensions/user_script_master_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/user_script_master.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
@@ skipping 72 matching lines @@
   scoped_ptr<content::TestBrowserThread> file_thread_;
   scoped_ptr<content::TestBrowserThread> ui_thread_;
 
   // Updated to the script shared memory when we get notified.
   base::SharedMemory* shared_memory_;
 };
 
 // Test that we get notified even when there are no scripts.
 TEST_F(UserScriptMasterTest, NoScripts) {
   TestingProfile profile;
-  scoped_refptr<UserScriptMaster> master(new UserScriptMaster(&profile));
-  master->StartLoad();
+  UserScriptMaster master(&profile);
+  master.StartLoad();
   message_loop_.PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
   message_loop_.Run();
 
   ASSERT_TRUE(shared_memory_ != NULL);
 }
 
 TEST_F(UserScriptMasterTest, Parse1) {
   const std::string text(
     "// This is my awesome script\n"
     "// It does stuff.\n"
     "// ==UserScript==   trailing garbage\n"
     "// @name foobar script\n"
     "// @namespace http://www.google.com/\n"
     "// @include *mail.google.com*\n"
     "// \n"
     "// @othergarbage\n"
     "// @include *mail.yahoo.com*\r\n"
     "// @include  \t *mail.msn.com*\n" // extra spaces after "@include" OK
     "//@include not-recognized\n" // must have one space after "//"
     "// ==/UserScript==  trailing garbage\n"
     "\n"
     "\n"
     "alert('hoo!');\n");
 
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
   ASSERT_EQ(3U, script.globs().size());
   EXPECT_EQ("*mail.google.com*", script.globs()[0]);
   EXPECT_EQ("*mail.yahoo.com*", script.globs()[1]);
   EXPECT_EQ("*mail.msn.com*", script.globs()[2]);
 }
 
 TEST_F(UserScriptMasterTest, Parse2) {
   const std::string text("default to @include *");
 
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
   ASSERT_EQ(1U, script.globs().size());
   EXPECT_EQ("*", script.globs()[0]);
 }
 
 TEST_F(UserScriptMasterTest, Parse3) {
   const std::string text(
     "// ==UserScript==\n"
     "// @include *foo*\n"
     "// ==/UserScript=="); // no trailing newline
 
   UserScript script;
-  UserScriptMaster::ScriptReloader::ParseMetadataHeader(text, &script);
+  UserScriptMaster::ParseMetadataHeader(text, &script);
   ASSERT_EQ(1U, script.globs().size());
   EXPECT_EQ("*foo*", script.globs()[0]);
 }
 
 TEST_F(UserScriptMasterTest, Parse4) {
   const std::string text(
     "// ==UserScript==\n"
     "// @match http://*.mail.google.com/*\n"
     "// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
   URLPatternSet expected_patterns;
   AddPattern(&expected_patterns, "http://*.mail.google.com/*");
   AddPattern(&expected_patterns, "http://mail.yahoo.com/*");
 
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
   EXPECT_EQ(0U, script.globs().size());
   EXPECT_EQ(expected_patterns, script.url_patterns());
 }
 
 TEST_F(UserScriptMasterTest, Parse5) {
   const std::string text(
     "// ==UserScript==\n"
     "// @match http://*mail.google.com/*\n"
     "// ==/UserScript==\n");
 
   // Invalid @match value.
   UserScript script;
-  EXPECT_FALSE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_FALSE(UserScriptMaster::ParseMetadataHeader(text, &script));
 }
 
 TEST_F(UserScriptMasterTest, Parse6) {
   const std::string text(
     "// ==UserScript==\n"
     "// @include http://*.mail.google.com/*\n"
     "// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
   // Allowed to match @include and @match.
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
 }
 
 TEST_F(UserScriptMasterTest, Parse7) {
   // Greasemonkey allows there to be any leading text before the comment marker.
   const std::string text(
     "// ==UserScript==\n"
     "adsasdfasf// @name hello\n"
     "  // @description\twiggity woo\n"
     "\t// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
   ASSERT_EQ("hello", script.name());
   ASSERT_EQ("wiggity woo", script.description());
   ASSERT_EQ(1U, script.url_patterns().patterns().size());
   EXPECT_EQ("http://mail.yahoo.com/*",
             script.url_patterns().begin()->GetAsString());
 }
 
 TEST_F(UserScriptMasterTest, Parse8) {
   const std::string text(
     "// ==UserScript==\n"
     "// @name myscript\n"
     "// @match http://www.google.com/*\n"
     "// @exclude_match http://www.google.com/foo*\n"
     "// ==/UserScript==\n");
 
   UserScript script;
-  EXPECT_TRUE(UserScriptMaster::ScriptReloader::ParseMetadataHeader(
-      text, &script));
+  EXPECT_TRUE(UserScriptMaster::ParseMetadataHeader(text, &script));
   ASSERT_EQ("myscript", script.name());
   ASSERT_EQ(1U, script.url_patterns().patterns().size());
   EXPECT_EQ("http://www.google.com/*",
             script.url_patterns().begin()->GetAsString());
   ASSERT_EQ(1U, script.exclude_url_patterns().patterns().size());
   EXPECT_EQ("http://www.google.com/foo*",
             script.exclude_url_patterns().begin()->GetAsString());
 }
 
 TEST_F(UserScriptMasterTest, SkipBOMAtTheBeginning) {
   base::FilePath path = temp_dir_.path().AppendASCII("script.user.js");
   const std::string content("\xEF\xBB\xBF alert('hello');");
   size_t written = base::WriteFile(path, content.c_str(), content.size());
   ASSERT_EQ(written, content.size());
 
   UserScript user_script;
   user_script.js_scripts().push_back(UserScript::File(
       temp_dir_.path(), path.BaseName(), GURL()));
 
   UserScriptList user_scripts;
   user_scripts.push_back(user_script);
 
-  UserScriptMaster::ScriptReloader* script_reloader =
-      new UserScriptMaster::ScriptReloader(NULL);
-  script_reloader->AddRef();
-  script_reloader->LoadUserScripts(&user_scripts);
-  script_reloader->Release();
+  UserScriptMaster::LoadScriptsForTest(&user_scripts);
 
   EXPECT_EQ(content.substr(3),
             user_scripts[0].js_scripts()[0].GetContent().as_string());
 }
 
 TEST_F(UserScriptMasterTest, LeaveBOMNotAtTheBeginning) {
   base::FilePath path = temp_dir_.path().AppendASCII("script.user.js");
   const std::string content("alert('here's a BOOM: \xEF\xBB\xBF');");
   size_t written = base::WriteFile(path, content.c_str(), content.size());
   ASSERT_EQ(written, content.size());
 
   UserScript user_script;
   user_script.js_scripts().push_back(UserScript::File(
       temp_dir_.path(), path.BaseName(), GURL()));
 
   UserScriptList user_scripts;
   user_scripts.push_back(user_script);
 
-  UserScriptMaster::ScriptReloader* script_reloader =
-      new UserScriptMaster::ScriptReloader(NULL);
-  script_reloader->AddRef();
-  script_reloader->LoadUserScripts(&user_scripts);
-  script_reloader->Release();
+  UserScriptMaster::LoadScriptsForTest(&user_scripts);
 
   EXPECT_EQ(content, user_scripts[0].js_scripts()[0].GetContent().as_string());
 }
 
 }  // namespace extensions