Fixes for -Wunused-function on Linux, Android and ChromeOS

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 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 "apps/launcher.h"
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 155 matching lines @@
   }
 
  private:
   bool auto_cancel_;
   int total_page_count_;
   int rendered_page_count_;
   scoped_refptr<content::MessageLoopRunner> waiting_runner_;
   gfx::Size dialog_size_;
 };
 
+#if !defined(OS_CHROMEOS)
 bool CopyTestDataAndSetCommandLineArg(

[Nico, 2013/11/10 05:07:09]

This function should be in !defined(OS_WIN) since that's where the call is.

(kTestFilePath should keep its current ifdef)

[hans, 2013/11/11 19:29:51]

Done.

     const base::FilePath& test_data_file,
     const base::FilePath& temp_dir,
     const char* filename) {
   base::FilePath path = temp_dir.AppendASCII(
       filename).NormalizePathSeparators();
   if (!(base::CopyFile(test_data_file, path)))
     return false;
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   command_line->AppendArgPath(path);
   return true;
 }
 
-#if !defined(OS_CHROMEOS)
 const char kTestFilePath[] = "platform_apps/launch_files/test.txt";
 #endif
 
 }  // namespace
 
 // Tests that CreateShellWindow doesn't crash if you close it straight away.
 // LauncherPlatformAppBrowserTest relies on this behaviour, but is only run for
 // ash, so we test that it works here.
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, CreateAndCloseShellWindow) {
   const Extension* extension = LoadAndLaunchPlatformApp("minimal");
@@ skipping 1097 matching lines @@
                                                           false);
   ASSERT_TRUE(restart_requested_listener.WaitUntilSatisfied());
 
   EXPECT_EQ(1, request_restart_call_count());
 }
 
 #endif  // defined(OS_CHROMEOS)
 
 
 }  // namespace extensions