Rename all occurrences of "app extension" with "extension app" since we were using both and consistency is nice.

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

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

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/tabs/pinned_tab_codec.cc b/chrome/browser/tabs/pinned_tab_codec.cc
index df096fc..3473343 100644
--- a/chrome/browser/tabs/pinned_tab_codec.cc
+++ b/chrome/browser/tabs/pinned_tab_codec.cc
@@ -43,7 +43,7 @@ static void EncodePinnedTab(TabStripModel* model,
 
   TabContents* tab_contents = model->GetTabContentsAt(index);
   if (model->IsAppTab(index)) {
-    Extension* extension = tab_contents->app_extension();
+    Extension* extension = tab_contents->extension_app();
     DCHECK(extension);
     value->SetString(kAppID, extension->id());
     // For apps we use the launch url. We do this for two reasons:
diff --git a/chrome/browser/tabs/tab_strip_model.cc b/chrome/browser/tabs/tab_strip_model.cc
index f08e9c5..be154f6 100644
--- a/chrome/browser/tabs/tab_strip_model.cc
+++ b/chrome/browser/tabs/tab_strip_model.cc
@@ -765,7 +765,7 @@ void TabStripModel::Observe(NotificationType type,
       // Iterate backwards as we may remove items while iterating.
       for (int i = count() - 1; i >= 0; i--) {
         TabContents* contents = GetTabContentsAt(i);
-        if (contents->app_extension() == extension) {
+        if (contents->extension_app() == extension) {
           // The extension an app tab was created from has been nuked. Delete
           // the TabContents. Deleting a TabContents results in a notification
           // of type TAB_CONTENTS_DESTROYED; we do the necessary cleanup in
@@ -937,11 +937,11 @@ bool TabStripModel::ShouldMakePhantomOnClose(int index) {
     if (!extension_service)
       return false;
 
-    Extension* app_extension = GetTabContentsAt(index)->app_extension();
-    DCHECK(app_extension);
+    Extension* extension_app = GetTabContentsAt(index)->extension_app();
+    DCHECK(extension_app);
 
     // Only allow the tab to be made phantom if the extension still exists.
-    return extension_service->GetExtensionById(app_extension->id(),
+    return extension_service->GetExtensionById(extension_app->id(),
                                                false) != NULL;
   }
   return false;
diff --git a/chrome/browser/tabs/tab_strip_model_unittest.cc b/chrome/browser/tabs/tab_strip_model_unittest.cc
index 7ffaac4..faf3bd7 100644
--- a/chrome/browser/tabs/tab_strip_model_unittest.cc
+++ b/chrome/browser/tabs/tab_strip_model_unittest.cc
@@ -1500,12 +1500,12 @@ TEST_F(TabStripModelTest, Apps) {
 #elif defined(OS_POSIX)
   FilePath path(FILE_PATH_LITERAL("/foo"));
 #endif
-  Extension app_extension(path);
-  app_extension.launch_web_url_ = "http://www.google.com";
+  Extension extension_app(path);
+  extension_app.launch_web_url_ = "http://www.google.com";
   TabContents* contents1 = CreateTabContents();
-  contents1->SetAppExtension(&app_extension);
+  contents1->SetExtensionApp(&extension_app);
   TabContents* contents2 = CreateTabContents();
-  contents2->SetAppExtension(&app_extension);
+  contents2->SetExtensionApp(&extension_app);
   TabContents* contents3 = CreateTabContents();
 
   SetID(contents1, 1);