Revert revision 176015

chrome/browser/extensions/platform_app_browsertest_util.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/platform_app_browsertest_util.h"
 
 #include "base/command_line.h"
 #include "base/stringprintf.h"
-#include "chrome/browser/extensions/api/tabs/tabs_api.h"
+#include "chrome/browser/extensions/api/tabs/tabs.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/browser/ui/extensions/shell_window.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 
@@ skipping 66 matching lines @@
       app_registry->shell_windows();
   for (iter = shell_windows.begin(); iter != shell_windows.end(); ++iter) {
     return *iter;
   }
 
   return NULL;
 }
 
 size_t PlatformAppBrowserTest::RunGetWindowsFunctionForExtension(
     const Extension* extension) {
-  scoped_refptr<WindowsGetAllFunction> function = new WindowsGetAllFunction();
+  scoped_refptr<GetAllWindowsFunction> function = new GetAllWindowsFunction();
   function->set_extension(extension);
   scoped_ptr<base::ListValue> result(utils::ToList(
       utils::RunFunctionAndReturnSingleResult(function.get(),
                                               "[]",
                                               browser())));
   return result->GetSize();
 }
 
 bool PlatformAppBrowserTest::RunGetWindowFunctionForExtension(
     int window_id,
     const Extension* extension) {
-  scoped_refptr<WindowsGetFunction> function = new WindowsGetFunction();
+  scoped_refptr<GetWindowFunction> function = new GetWindowFunction();
   function->set_extension(extension);
   utils::RunFunction(
           function.get(),
           base::StringPrintf("[%u]", window_id),
           browser(),
           utils::NONE);
   return function->GetResultList() != NULL;
 }
 
 size_t PlatformAppBrowserTest::GetShellWindowCount() {
@@ skipping 33 matching lines @@
   destroyed_observer.Wait();
 }
 
 void ExperimentalPlatformAppBrowserTest::SetUpCommandLine(
     CommandLine* command_line) {
   PlatformAppBrowserTest::SetUpCommandLine(command_line);
   command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
 }
 
 }  // namespace extensions