Revert 176015

chrome/browser/extensions/api/tabs/tabs_interactive_test.cc

Index: chrome/browser/extensions/api/tabs/tabs_interactive_test.cc
===================================================================
--- chrome/browser/extensions/api/tabs/tabs_interactive_test.cc	(revision 176046)
+++ chrome/browser/extensions/api/tabs/tabs_interactive_test.cc	(working copy)
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "chrome/browser/extensions/api/tabs/tabs.h"
+
 #include "base/values.h"
-#include "chrome/browser/extensions/api/tabs/tabs_api.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/in_process_browser_test.h"
-#include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 
 namespace keys = extensions::tabs_constants;
@@ -31,8 +32,8 @@
   Browser* new_browser = CreateBrowser(browser()->profile());
   int focused_window_id = ExtensionTabUtil::GetWindowId(new_browser);
 
-  scoped_refptr<WindowsGetLastFocusedFunction> function =
-      new WindowsGetLastFocusedFunction();
+  scoped_refptr<GetLastFocusedWindowFunction> function =
+      new GetLastFocusedWindowFunction();
   scoped_refptr<extensions::Extension> extension(utils::CreateEmptyExtension());
   function->set_extension(extension.get());
   scoped_ptr<base::DictionaryValue> result(utils::ToDictionary(
@@ -46,7 +47,7 @@
   ListValue* tabs = NULL;
   EXPECT_FALSE(result.get()->GetList(keys::kTabsKey, &tabs));
 
-  function = new WindowsGetLastFocusedFunction();
+  function = new GetLastFocusedWindowFunction();
   function->set_extension(extension.get());
   result.reset(utils::ToDictionary(
       utils::RunFunctionAndReturnSingleResult(function.get(),
@@ -82,7 +83,7 @@
   int focused_window_id = ExtensionTabUtil::GetWindowId(focused_window);
 
   // Get tabs in the 'last focused' window called from non-focused browser.
-  scoped_refptr<TabsQueryFunction> function = new TabsQueryFunction();
+  scoped_refptr<QueryTabsFunction> function = new QueryTabsFunction();
   scoped_ptr<base::ListValue> result(utils::ToList(
       utils::RunFunctionAndReturnSingleResult(function.get(),
                                               "[{\"lastFocusedWindow\":true}]",
@@ -99,7 +100,7 @@
   }
 
   // Get tabs NOT in the 'last focused' window called from the focused browser.
-  function = new TabsQueryFunction();
+  function = new QueryTabsFunction();
   result.reset(utils::ToList(
       utils::RunFunctionAndReturnSingleResult(function.get(),
                                               "[{\"lastFocusedWindow\":false}]",