| Index: chrome/browser/extensions/extension_prefs_unittest.cc
|
| ===================================================================
|
| --- chrome/browser/extensions/extension_prefs_unittest.cc (revision 54340)
|
| +++ chrome/browser/extensions/extension_prefs_unittest.cc (working copy)
|
| @@ -6,7 +6,7 @@
|
| #include "base/path_service.h"
|
| #include "base/scoped_temp_dir.h"
|
| #include "base/stl_util-inl.h"
|
| -#include "base/string_util.h"
|
| +#include "base/string_number_conversions.h"
|
| #include "chrome/browser/chrome_thread.h"
|
| #include "chrome/browser/extensions/extension_prefs.h"
|
| #include "chrome/browser/extensions/test_extension_prefs.h"
|
| @@ -172,7 +172,7 @@
|
|
|
| // Install 5 extensions.
|
| for (int i = 0; i < 5; i++) {
|
| - std::string name = "test" + IntToString(i);
|
| + std::string name = "test" + base::IntToString(i);
|
| extensions_.push_back(linked_ptr<Extension>(prefs_.AddExtension(name)));
|
| }
|
| EXPECT_EQ(NULL, prefs()->GetInstalledExtensionInfo(not_installed_id_));
|
| @@ -225,8 +225,9 @@
|
| public:
|
| // Sets idle install information for one test extension.
|
| void SetIdleInfo(std::string id, int num) {
|
| - prefs()->SetIdleInstallInfo(id, basedir_.AppendASCII(IntToString(num)),
|
| - "1." + IntToString(num),
|
| + prefs()->SetIdleInstallInfo(id,
|
| + basedir_.AppendASCII(base::IntToString(num)),
|
| + "1." + base::IntToString(num),
|
| now_ + TimeDelta::FromSeconds(num));
|
| }
|
|
|
| @@ -239,8 +240,8 @@
|
| ASSERT_TRUE(prefs()->GetIdleInstallInfo(id, &crx_path, &version,
|
| &fetch_time));
|
| ASSERT_EQ(crx_path.value(),
|
| - basedir_.AppendASCII(IntToString(num)).value());
|
| - ASSERT_EQ("1." + IntToString(num), version);
|
| + basedir_.AppendASCII(base::IntToString(num)).value());
|
| + ASSERT_EQ("1." + base::IntToString(num), version);
|
| ASSERT_TRUE(fetch_time == now_ + TimeDelta::FromSeconds(num));
|
| }
|
|
|
|
|