Revert "BUG=12114"

chrome/common/extensions/extension_unittest.cc

 // Copyright (c) 2006-2008 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/file_path.h"
 #include "base/string_util.h"
 #include "base/path_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_reporter.h"
@@ skipping 25 matching lines @@
   JSONFileValueSerializer serializer(extensions_path);
   scoped_ptr<DictionaryValue> valid_value(
       static_cast<DictionaryValue*>(serializer.Deserialize(&error)));
   ASSERT_TRUE(valid_value.get());
   ASSERT_EQ("", error);
   ASSERT_TRUE(extension.InitFromValue(*valid_value, true, &error));
   ASSERT_EQ("", error);
 
   scoped_ptr<DictionaryValue> input_value;
 
+  // Test missing and invalid ids
+  input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
+  input_value->Remove(Extension::kIdKey, NULL);
+  EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
+  EXPECT_EQ(Extension::kInvalidIdError, error);
+
+  input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
+  input_value->SetInteger(Extension::kIdKey, 42);
+  EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
+  EXPECT_EQ(Extension::kInvalidIdError, error);
+
   // Test missing and invalid versions
   input_value.reset(static_cast<DictionaryValue*>(valid_value->DeepCopy()));
   input_value->Remove(Extension::kVersionKey, NULL);
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_EQ(Extension::kInvalidVersionError, error);
 
   input_value->SetInteger(Extension::kVersionKey, 42);
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_EQ(Extension::kInvalidVersionError, error);
 
@@ skipping 130 matching lines @@
   EXPECT_FALSE(extension.InitFromValue(*input_value, true, &error));
   EXPECT_TRUE(MatchPattern(error, Extension::kInvalidPermissionSchemeError));
 }
 
 TEST(ExtensionTest, InitFromValueValid) {
 #if defined(OS_WIN)
   FilePath path(FILE_PATH_LITERAL("C:\\foo"));
 #elif defined(OS_POSIX)
   FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
-  Extension::ResetGeneratedIdCounter();
-
   Extension extension(path);
   std::string error;
   DictionaryValue input_value;
 
   // Test minimal extension
+  input_value.SetString(Extension::kIdKey,
+      "00123456789ABCDEF0123456789ABCDEF0123456");
   input_value.SetString(Extension::kVersionKey, "1.0.0.0");
   input_value.SetString(Extension::kNameKey, "my extension");
 
-  EXPECT_TRUE(extension.InitFromValue(input_value, false, &error));
+  EXPECT_TRUE(extension.InitFromValue(input_value, true, &error));
   EXPECT_EQ("", error);
-  EXPECT_EQ("0000000000000000000000000000000000000000", extension.id());
+  EXPECT_EQ("00123456789abcdef0123456789abcdef0123456", extension.id());
   EXPECT_EQ("1.0.0.0", extension.VersionString());
   EXPECT_EQ("my extension", extension.name());
-  EXPECT_EQ("chrome-extension://0000000000000000000000000000000000000000/",
+  EXPECT_EQ("chrome-extension://00123456789abcdef0123456789abcdef0123456/",
             extension.url().spec());
   EXPECT_EQ(path.value(), extension.path().value());
 }
 
 TEST(ExtensionTest, GetResourceURLAndPath) {
 #if defined(OS_WIN)
   FilePath path(FILE_PATH_LITERAL("C:\\foo"));
 #elif defined(OS_POSIX)
   FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
   Extension extension(path);
   DictionaryValue input_value;
+  input_value.SetString(Extension::kIdKey,
+      "00123456789ABCDEF0123456789ABCDEF0123456");
   input_value.SetString(Extension::kVersionKey, "1.0.0.0");
   input_value.SetString(Extension::kNameKey, "my extension");
-  EXPECT_TRUE(extension.InitFromValue(input_value, false, NULL));
+  EXPECT_TRUE(extension.InitFromValue(input_value, true, NULL));
 
   EXPECT_EQ(extension.url().spec() + "bar/baz.js",
             Extension::GetResourceURL(extension.url(), "bar/baz.js").spec());
   EXPECT_EQ(extension.url().spec() + "baz.js",
             Extension::GetResourceURL(extension.url(), "bar/../baz.js").spec());
   EXPECT_EQ(extension.url().spec() + "baz.js",
             Extension::GetResourceURL(extension.url(), "../baz.js").spec());
 
   EXPECT_EQ(path.Append(FILE_PATH_LITERAL("bar"))
                 .Append(FILE_PATH_LITERAL("baz.js")).value(),
             Extension::GetResourcePath(extension.path(), "bar/baz.js").value());
   EXPECT_EQ(path.Append(FILE_PATH_LITERAL("baz.js")).value(),
             Extension::GetResourcePath(extension.path(), "bar/../baz.js")
                 .value());
   EXPECT_EQ(FilePath().value(),
             Extension::GetResourcePath(extension.path(), "../baz.js").value());
 }