Wires TabContents to app extensions.

BUG=32845
TEST=none

Review URL: http://codereview.chromium.org/566032

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38212 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 6 deletions

diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc
index 8bd7b2f..eef996e 100644
--- a/chrome/common/extensions/extension.cc
+++ b/chrome/common/extensions/extension.cc
@@ -783,10 +783,10 @@ bool Extension::InitFromValue(const DictionaryValue& source, bool require_id,
   if (source.HasKey(keys::kPublicKey)) {
     std::string public_key_bytes;
     if (!source.GetString(keys::kPublicKey, &public_key_) ||
-      !ParsePEMKeyBytes(public_key_, &public_key_bytes) ||
-      !GenerateId(public_key_bytes, &id_)) {
-        *error = errors::kInvalidKey;
-        return false;
+        !ParsePEMKeyBytes(public_key_, &public_key_bytes) ||
+        !GenerateId(public_key_bytes, &id_)) {
+      *error = errors::kInvalidKey;
+      return false;
     }
   } else if (require_id) {
     *error = errors::kInvalidKey;
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index c858534..0e521c4 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -423,16 +423,17 @@ class Extension {
 
   // The URL an app should launch to.
   GURL app_launch_url_;
-  
+
   // The type of window to start when the application is launched.
   AppLaunchWindowType app_launch_window_type_;
-  
+
   // Runtime data:
 
   // True if the background page is ready.
   bool background_page_ready_;
 
   FRIEND_TEST(ExtensionTest, LoadPageActionHelper);
+  FRIEND_TEST(TabStripModelTest, Apps);
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };